1

README.md

@@ -48,3 +48,18 @@ http://120.25.146.52:3090/project/228/interface/api/cat_2077
     通过token获取用户数据，无法越过token获取其他数据，用户Id强校验
 ~~~~
 
+
+~~~~
+1， 文件夹相关接口 folderType 40未深时点云文件夹，50为深光点云，570未e57点云 ,7深寻
+
+2. /ucenter/user/folder/move 
+sceneIds改为numList,取值从场景id改为num。结构从字符串逗号隔开，改为数组
+   
+3, /ucenter/user/scene/newList  
+    sceneSouce 4深时，5深光， 7 为深寻
+    接口isObj ,0为点云场景，1mesh场景
+    
+4.协作相关接口 添加参数sceneType  mesh，laser 
+
+5.findSceneNumber 添加  sx  key 
+~~~~

src/main/java/com/fdkankan/ucenter/common/SceneSourceUtil.java

@@ -5,7 +5,12 @@ import java.util.List;
 
 public class SceneSourceUtil {
 
+    public static List<Integer> LaserSceneSource = Arrays.asList(4,5,7,57);
     public static List<Integer> getLaserList(){
-        return Arrays.asList(4,5,57);
+        return LaserSceneSource;
+    }
+
+    public static boolean isLaser(Integer sceneSource) {
+        return LaserSceneSource.contains(sceneSource);
     }
 }

src/main/java/com/fdkankan/ucenter/config/UcenterConfig.java

@@ -0,0 +1,14 @@
+package com.fdkankan.ucenter.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Data
+@Configuration
+public class UcenterConfig {
+    @Value("${4dkk.laserService.basePath}")
+    private String basePath;
+    @Value("${spring.profiles.active}")
+    private String active;
+}

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

@@ -35,8 +35,6 @@ import java.util.*;
 @RequestMapping("/ucenter/test")
 public class TestController extends BaseController {
 
-
-
     @Autowired
     IAppSecretService appSecretService;
 
@@ -55,10 +53,64 @@ public class TestController extends BaseController {
         return ResultData.ok();
     }
 
-    public static void main(String[] args) {
-        String res = "kGrSGgjqIzNDU25JvSsQZAMTEyadJ8wC";
-        String password = Base64Converter.decode(Base64Converter.subText(res));
 
-        System.out.println(password);
+    @Autowired
+    IFolderService folderService;
+    @Autowired
+    IFolderSceneService folderSceneService;
+    @Autowired
+    IScenePlusService scenePlusService;
+    @Autowired
+    ISceneProService sceneProService;
+
+
+    @GetMapping("/updateFolder")
+    public ResultData updateFolder(){
+        LambdaQueryWrapper<Folder> wrapper = new LambdaQueryWrapper<>();
+        wrapper.isNotNull(Folder::getLaserParentId);
+        List<Folder> list = folderService.list(wrapper);
+
+        HashMap<Long,Long> map = new HashMap<>();
+        for (Folder folder : list) {
+            map.put(folder.getLaserId(),folder.getId());
+        }
+        for (Folder folder : list) {
+            Long newParentId = map.get(folder.getLaserParentId());
+            if(newParentId == null){
+                continue;
+            }
+            LambdaUpdateWrapper<Folder> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(Folder::getId,folder.getId());
+            updateWrapper.set(Folder::getParentId,newParentId);
+            folderService.update(updateWrapper);
+        }
+
+        return ResultData.ok();
+    }
+
+    @GetMapping("/updateFolderScene")
+    public ResultData updateFolderScene(){
+        List<FolderScene> list = folderSceneService.list();
+        for (FolderScene folderScene : list) {
+            String num = null;
+            ScenePro scenePro = sceneProService.getById(folderScene.getSceneId());
+            if(scenePro !=null){
+                num = scenePro.getNum();
+            }else {
+                ScenePlus scenePlus = scenePlusService.getById(folderScene.getSceneId());
+                if(scenePlus != null){
+                    num = scenePlus.getNum();
+                }
+            }
+
+            LambdaUpdateWrapper<FolderScene> wrapper = new LambdaUpdateWrapper<>();
+            wrapper.eq(FolderScene::getId,folderScene.getId());
+            wrapper.set(FolderScene::getNum,num);
+            folderSceneService.update(wrapper);
+        }
+
+        return ResultData.ok();
     }
+
+
 }

src/main/java/com/fdkankan/ucenter/entity/Folder.java

@@ -52,6 +52,12 @@ public class Folder implements Serializable {
     @TableField("parent_id")
     private Long parentId;
 
+    @TableField("laser_id")
+    private Long laserId;
+
+    @TableField("laser_parent_id")
+    private Long laserParentId;
+
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")
     private String recStatus;

src/main/java/com/fdkankan/ucenter/entity/FolderScene.java

@@ -34,6 +34,9 @@ public class FolderScene implements Serializable {
     @TableField("scene_id")
     private Long sceneId;
 
+    @TableField("num")
+    private String num;
+
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")
     private String recStatus;

src/main/java/com/fdkankan/ucenter/mapper/IFolderSceneMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
 @Mapper
 public interface IFolderSceneMapper extends BaseMapper<FolderScene> {
 
-    FolderScene getByType(@Param("sceneId")Long sceneId, @Param("type")Integer type);
+    FolderScene getByType(@Param("num")String num, @Param("type")Integer type);
 
     List<GroupByCount> getGroupByFolderIds(@Param("folderIds") List<Long> folderIds);
 }

src/main/java/com/fdkankan/ucenter/service/IFolderSceneService.java

@@ -19,7 +19,7 @@ public interface IFolderSceneService extends IService<FolderScene> {
 
     void deleteByFolderIds(List<Long> delIds,Long userId);
 
-    FolderScene getByType(Long sceneId, Integer type);
+    FolderScene getByType(String num, Integer type);
 
     HashMap<Long, Long> getGroupByFolderIds(List<Folder> folderIds);
 

src/main/java/com/fdkankan/ucenter/service/impl/AppSceneService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.ucenter.common.BaseController;
+import com.fdkankan.ucenter.common.SceneSourceUtil;
 import com.fdkankan.ucenter.common.constants.ConstantFilePath;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.common.exception.BusinessException;
@@ -328,7 +329,7 @@ public class AppSceneService extends BaseController {
         }
         sceneProService.deleteByList(proList,plusList,userId, null);
 
-        if(sceneSource != null && (sceneSource == 4 || sceneSource == 5)){
+        if(sceneSource != null && (SceneSourceUtil.isLaser(sceneSource))){
             laserService.delete(sceneNum);
         }
     }

src/main/java/com/fdkankan/ucenter/service/impl/FolderSceneServiceImpl.java

@@ -49,8 +49,8 @@ public class FolderSceneServiceImpl extends ServiceImpl<IFolderSceneMapper, Fold
     }
 
     @Override
-    public FolderScene getByType(Long sceneId, Integer type) {
-        return getBaseMapper().getByType(sceneId,type);
+    public FolderScene getByType(String num, Integer type) {
+        return getBaseMapper().getByType(num,type);
     }
 
     @Override

src/main/java/com/fdkankan/ucenter/service/impl/FolderServiceImpl.java

@@ -51,7 +51,7 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
     @Override
     public void add(FolderParam param) {
         User user = userService.getByUserName(param.getUserName());
-        List<Folder> list = findByParentIdAndName(param.getParentId(), param.getName(), user.getId(), param.getType());
+        List<Folder> list = findByParentIdAndName(param.getParentId(), param.getName(), user.getId(), param.getType(),param.getIsObj());
         if(list != null && list.size() > 0){
             throw new BusinessException(SceneConstant.FAILURE_CODE_5030, SceneConstant.FAILURE_MSG_5030);
         }
@@ -97,7 +97,7 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
 
     @Override
     public List<FolderTree> findListTree(String folderIds,Integer type, String username) {
-        if(type == null){
+        if(type == null ){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
         User user = userService.getByUserName(username);
@@ -114,10 +114,10 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
         if(user == null){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3004, LoginConstant.FAILURE_MSG_3004);
         }
-        if(StringUtils.isEmpty(param.getFolderIds()) && StringUtils.isEmpty(param.getSceneIds())){
+        if(StringUtils.isEmpty(param.getFolderIds()) && param.getNumList().isEmpty()){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
-        if(param.getType() == null){
+        if(param.getType() == null ){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
         if(StringUtils.isNotEmpty(param.getFolderIds())){
@@ -161,26 +161,26 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
             }
 
         }
-        if(StringUtils.isNotEmpty(param.getSceneIds())){
-            String[] sceneIds = param.getSceneIds().split(",");
+        for (String num : param.getNumList()) {
             FolderScene folderSceneEntity = null;
-            for (String sceneId : sceneIds) {
-                folderSceneEntity = folderSceneService.getByType(Long.valueOf(sceneId), param.getType());
-                if(folderSceneEntity != null){
-                    folderSceneService.removeById(folderSceneEntity.getId());
-                }
-                if(param.getParentId() != null){
-                    Folder folderEntity = getById(param.getParentId());
-                    if(!folderEntity.getType().equals(param.getType())){
-                        throw new BusinessException(SceneConstant.FAILURE_CODE_5030, SceneConstant.FAILURE_MSG_5030);
-                    }
-                    folderSceneEntity = new FolderScene();
-                    folderSceneEntity.setSceneId(Long.valueOf(sceneId));
-                    folderSceneEntity.setFolderId(param.getParentId());
-                    folderSceneService.save(folderSceneEntity);
+            folderSceneEntity = folderSceneService.getByType(num, param.getType());
+            if(folderSceneEntity != null){
+                folderSceneService.removeById(folderSceneEntity.getId());
+            }
+            if(param.getParentId() != null){
+                Folder folderEntity = getById(param.getParentId());
+                if(!folderEntity.getType().equals(param.getType())){
+                    throw new BusinessException(SceneConstant.FAILURE_CODE_5030, SceneConstant.FAILURE_MSG_5030);
                 }
+                folderSceneEntity = new FolderScene();
+                folderSceneEntity.setNum(num);
+                folderSceneEntity.setFolderId(param.getParentId());
+                folderSceneService.save(folderSceneEntity);
             }
         }
+        if(StringUtils.isNotEmpty(param.getSceneIds())){
+
+        }
 
     }
 
@@ -208,7 +208,6 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
         if(folderIdList.size() >0){
             wrapper.notIn(Folder::getId,folderIdList);
         }
-
         wrapper.eq(Folder::getUserId,userId)
                 .eq(Folder::getType,type);
         return this.list(wrapper);

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

@@ -243,7 +243,7 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
         User user = userService.getByUserName(username);
         LambdaQueryWrapper<SceneCooperation> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(SceneCooperation::getUserId,user.getId());
-        wrapper.eq(SceneCooperation::getSceneType,"mesh");
+        wrapper.eq(SceneCooperation::getSceneType,param.getIsObj() == 1?"mesh":"laser");
         List<SceneCooperation> list = this.list(wrapper);
         List<String> numList = list.parallelStream().map(SceneCooperation::getSceneNum).collect(Collectors.toList());
         if(numList.size() <=0){
@@ -278,7 +278,7 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
         List<ScenePlus> plusList = scenePlusService.getListByNums(numList);
         //this.deleteCooperationList(proList,plusList,Arrays.asList(user.getId()));
 
-        saveCooperationCommon(loginUser,param.getLang(),Arrays.asList(user),proList,plusList,null,"scene","mesh");
+        saveCooperationCommon(loginUser,param.getLang(),Arrays.asList(user),proList,plusList,null,"scene",param.getSceneType());
     }
 
     @Override

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

@@ -16,6 +16,7 @@ import com.fdkankan.model.utils.CreateObjUtil;
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.common.RedisKeyUtil;
 import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.common.SceneSourceUtil;
 import com.fdkankan.ucenter.common.constants.ConstantFilePath;
 import com.fdkankan.ucenter.common.constants.ResultCodeMsg;
 import com.fdkankan.ucenter.common.constants.UploadFilePath;
@@ -236,7 +237,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 });
             }
 
-            if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5){  //深时复制
+            if(SceneSourceUtil.isLaser(scenePlus.getSceneSource())){  //深时复制
                 laserService.copy(oldNum,newNum,newDataSource,true);
             }else {
                 laserService.cloudPointBuild(oldNum,newNum);
@@ -256,7 +257,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
                 sceneCommonService.updateNasSceneJson(targetData,oldNum,newNum,scenePlus.getTitle(),"v4","scene.json");
 
-                if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5){  //深时复制
+                if(SceneSourceUtil.isLaser(scenePlus.getSceneSource())){  //深时复制
                     laserService.copy(oldNum,newNum,newDataSource,false);
                 }
                 String redisKey = RedisKeyUtil.laserCopyLock + newNum;

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

@@ -21,7 +21,9 @@ import com.fdkankan.ucenter.common.OssPath;
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.ucenter.common.SceneSourceUtil;
 import com.fdkankan.ucenter.common.constants.ResultCodeMsg;
+import com.fdkankan.ucenter.config.UcenterConfig;
 import com.fdkankan.ucenter.config.ThreadPoolConfig;
 import com.fdkankan.ucenter.constant.CameraConstant;
 import com.fdkankan.ucenter.constant.LoginConstant;
@@ -49,7 +51,6 @@ import org.joda.time.DateTime;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -146,6 +147,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         SceneNumVo sceneNumVoE57 = fdkkLaserService.getLaserSceneNumByUser(token,57);
         SceneNumVo sceneNumVoE57Obj = getSceneNumVoByObjType(Arrays.asList(57), user.getId());
+
+        SceneNumVo sceneNumVoSX = fdkkLaserService.getLaserSceneNumByUser(token,7);
+
         HashMap<String, SceneNumVo> hashMap = new HashMap<>();
         hashMap.put("kk",sceneNumVoKk);
         hashMap.put("kJ",sceneNumVoKj);
@@ -155,6 +159,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         hashMap.put("SG_OBJ",sceneNumVoSGObj);
         hashMap.put("e57",sceneNumVoE57);
         hashMap.put("e57_OBJ",sceneNumVoE57Obj);
+        hashMap.put("sx",sceneNumVoSX);
         return hashMap;
     }
 
@@ -510,6 +515,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         return PageInfo.PageInfo(sceneList);
     }
 
+    @Autowired
+    UcenterConfig ucenterConfig;
     @Override
     public JSONObject newList(SceneParam param, String username) {
         param.setSourceList(getSceneSource(param.getSceneSource()));
@@ -517,8 +524,20 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             User user = userService.getByUserName(username);
             param.setUserId(user.getId());
         }
-
+        if(!param.getSceneSource().contains("4") || !param.getSceneSource().contains("5")){
+            param.setIsObj(0);
+        }
         Page<SceneVo> sceneVoPage = getBaseMapper().pageListAndFolder(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        for (SceneVo record : sceneVoPage.getRecords()) {
+            if(param.getIsObj()== 0 && SceneSourceUtil.isLaser(record.getSceneSource())){
+                if(ucenterConfig.getActive().contains("prod")){
+                    record.setWebSite(ucenterConfig.getBasePath() +"/index.html?m="+record.getNum());
+                }else {
+                    record.setWebSite(ucenterConfig.getBasePath() +"/uat/index.html?m="+record.getNum());
+                }
+                record.setSceneName(record.getLaserTitle());
+            }
+        }
 
         List<SceneVo> folderList = sceneVoPage.getRecords().parallelStream().filter(entity -> entity.getIsFolder() == 1).collect(Collectors.toList());
         Long totalSceneNum = sceneVoPage.getTotal();
@@ -542,7 +561,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         //设置协作者信息
         if(sceneVoPage.getRecords().size() >0){
             List<String> numList = sceneVoPage.getRecords().parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
-            HashMap<String,List<User>> cooMap = sceneCooperationService.getByNumList(numList,"mesh");
+            HashMap<String,List<User>> cooMap = sceneCooperationService.getByNumList(numList, param.getIsObj() ==1 ?"mesh":"laser");
             for (SceneVo vo : sceneVoPage.getRecords()) {
                 if (StringUtils.isNotBlank(vo.getNum())) {
                     List<User> userVos = cooMap.get(vo.getNum());
@@ -579,7 +598,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             folderList.addAll(sceneList);
         }
         sceneVoPage.setRecords(folderList);
-        if(param.getFolderId() == null && param.getIsObj() == null ){
+        if(param.getFolderId() == null && param.getIsObj() == 0 ){
             List<String> sourceList = param.getSourceList();
             if(param.getUserId()!= null){
                 totalSceneNum = this.getCountByUserId(param.getUserId(),sourceList);
@@ -588,7 +607,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
         }else if(param.getFolderId() != null ){
             totalSceneNum = folderSceneService.getCountByFolderAndSon(param.getFolderId());
-        }else if(param.getIsObj() != null && param.getIsObj() ==1){
+        }else if(param.getIsObj() == 1){
             if(param.getUserId()!= null){
                 totalSceneNum = this.getCountByLaserAndIsObj(param.getUserId(),Integer.valueOf(param.getSceneSource()));
             }
@@ -809,7 +828,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             oldEditScene.setFloorPlanPng(oldEditScene.getFloorPlanPng() == null ? null : oldEditScene.getFloorPlanPng().replace(oldNum, scenePro.getNum()));
             sceneProEditService.save(oldEditScene);
 
-            if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5) {  //深时复制
+            if(SceneSourceUtil.isLaser(scenePro.getSceneSource())) {  //深时复制
                 laserService.copy(oldNum,newNum,newDataSource,true);
             }
 
@@ -840,7 +859,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 String targetVoice = String.format(SceneResourcePath.voicePath, scenePro.getNum());
                 this.copyOssAndNas(oldNum,scenePro.getNum(),sourceVoice,targetVoice);
 
-                if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5){  //深时复制
+                if(SceneSourceUtil.isLaser(scenePro.getSceneSource())){  //深时复制
                     laserService.copy(oldNum,newNum,newDataSource,false);
                 }
                 scenePro.setStatus(-2);
@@ -902,7 +921,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             for (ScenePro scenePro : proList) {
                 cameraMap.merge(scenePro.getCameraId(), scenePro.getSpace(), Long::sum);
                 sceneDelLogService.saveLog(scenePro.getNum(),userId);
-                if(StringUtils.isBlank(platform)  && (scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5 || scenePro.getSceneSource() == 57)){
+                if(StringUtils.isBlank(platform)  && (SceneSourceUtil.isLaser(scenePro.getSceneSource()))){
                     laserService.delete(scenePro.getNum());
                 }
             }
@@ -921,7 +940,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
                 }
                 sceneDelLogService.saveLog(scenePlus.getNum(),userId);
-                if(StringUtils.isBlank(platform) && ( scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5|| scenePlus.getSceneSource() == 57)){
+                if(StringUtils.isBlank(platform) && ( SceneSourceUtil.isLaser(scenePlus.getSceneSource()))){
                     laserService.delete(scenePlus.getNum());
                 }
             }

src/main/java/com/fdkankan/ucenter/vo/request/FolderParam.java

@@ -2,6 +2,9 @@ package com.fdkankan.ucenter.vo.request;
 
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 public class FolderParam {
     private Long id;
@@ -12,4 +15,5 @@ public class FolderParam {
 
     private String folderIds;
     private String sceneIds;
+    private List<String> numList = new ArrayList<>();
 }

src/main/java/com/fdkankan/ucenter/vo/request/SceneParam.java

@@ -28,7 +28,7 @@ public class SceneParam extends RequestBase {
     private Integer haveVoid;
     private Integer status;
 
-    private Integer isObj;
+    private Integer isObj = 1;
 
     private String startTime;
     private String endTime;

src/main/java/com/fdkankan/ucenter/vo/response/SceneVo.java

@@ -58,6 +58,7 @@ public class SceneVo {
     private String updateTime;
     private Integer removePortrait;
     private Integer sceneSource;
+    private String laserTitle;
 
     public String getCreateTime() {
         return DateUserUtil.getDayTime(createTime);

src/main/resources/mapper/ucenter/FolderSceneMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="getByType" resultType="com.fdkankan.ucenter.entity.FolderScene">
         SELECT b.* from t_folder a left join t_folder_scene b on a.id = b.folder_id
-        where  b.rec_status ='A' and b.scene_id = #{sceneId}
+        where  b.rec_status ='A' and b.num = #{num}
         <if test= 'type != null'>
          and a.type = #{type}
         </if>

src/main/resources/mapper/ucenter/SceneProMapper.xml

@@ -25,7 +25,7 @@
         <include refid="HasFolder"></include>
         SELECT * FROM (
         SELECT DISTINCT  p.id ,null as name ,0 as isFolder,null as type,null as parentId ,p.create_time,num,scene_name,scene_dec,
-        p.status,pay_status,thumb,web_site,0 as is_upgrade,sn_code,view_count,p.build_type, null as removePortrait,p.scene_source
+        p.status,pay_status,thumb,web_site,0 as is_upgrade,sn_code,view_count,p.build_type, null as removePortrait,p.scene_source,p.laser_title
         FROM t_scene_pro p
         <include refid="sceneJoinCamera"></include>
         WHERE is_upgrade = 0 and  p.rec_status = 'A'
@@ -35,12 +35,12 @@
         <if test="param.sceneName !=null and param.sceneName !=''">
           and  p.scene_name like CONCAT('%',#{param.sceneName},'%')
         </if>
-        <if test="param.isObj !=null ">
+        <if test="param.isObj !=null and param.isObj ==1">
           and  p.is_obj  = #{param.isObj}
         </if>
         UNION ALL
         SELECT  DISTINCT  p.id as id ,null as name ,0 as isFolder,null as type,null as parentId,e.algorithm_time as createTime ,num,title as scene_name,description as scene_dec,
-        scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,sn_code,view_count,e.build_type,p.remove_portrait as removePortrait,p.scene_source
+        scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,sn_code,view_count,e.build_type,p.remove_portrait as removePortrait,p.scene_source,p.laser_title
         FROM t_scene_plus p
         LEFT JOIN t_scene_plus_ext e on p.id = e.plus_id
         <include refid="sceneJoinCamera"></include>
@@ -51,7 +51,7 @@
         <if test="param.sceneName !=null and param.sceneName !=''">
           and  p.title like CONCAT('%',#{param.sceneName},'%')
         </if>
-        <if test="param.isObj !=null ">
+        <if test="param.isObj !=null and param.isObj ==1">
             and  e.is_obj  = #{param.isObj}
         </if>
         ORDER BY create_time desc ,id desc