场景保存、获取场景详情增加loadingLogo字段

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

@@ -147,4 +147,9 @@ public class SceneJsonBean {
      */
     private Integer tags;
 
+    /**
+     * 加载logo文件名
+     */
+    private String loadingLogo;
+
 }

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

@@ -2,6 +2,7 @@ package com.fdkankan.scene.controller;
 
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.controller.BaseController;
 import com.fdkankan.common.exception.BusinessException;
@@ -14,7 +15,12 @@ import com.fdkankan.platform.api.vo.Camera;
 import com.fdkankan.scene.entity.SceneCooperation;
 import com.fdkankan.scene.service.ISceneCooperationService;
 import com.fdkankan.scene.vo.SceneCooperationParamVO;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -59,5 +65,154 @@ public class SceneCooperationController extends BaseController {
         return sceneCooperationService.sceneResourceBySceneNum(param);
     }
 
+//    /**
+//     * 协作的场景
+//     * @return
+//     */
+//    @ApiOperation("协作的场景--文件夹形式")
+//    @RequestMapping(value = "/cooperationSceneListNew", method = RequestMethod.POST)
+//    @ApiImplicitParams({
+//        @ApiImplicitParam(name = "pageNum", value = "分页", dataType = "number"),
+//        @ApiImplicitParam(name = "sceneSource", value = "1表示八目，2双目", dataType = "number"),
+//        @ApiImplicitParam(name = "sceneType", value = "场景类型,0表示其他，1表示文博，2表示地产，3表示电商，4表示餐饮，5表示家居", dataType = "number"),
+//        @ApiImplicitParam(name = "folderType", value = "文件夹类型：0场景，1协作场景", dataType = "String"),
+//        @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);
+//    }
+
+
+    @PostMapping("/test")
+    public Page test(int pageNum, int pageSize){
+
+        Page<SceneCooperation> page = new Page<>(pageNum, pageSize);
+        sceneCooperationService.page(page);
+        return page;
+
+    }
+
 }
 

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

@@ -146,6 +146,12 @@ public class SceneEditInfo implements Serializable {
     private String entry;
 
     /**
+     * 加载logo文件名
+     */
+    @TableField("loading_logo")
+    private String loadingLogo;
+
+    /**
      * 创建时间
      */
     @TableField("create_time")

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

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.vo;
 
+import com.fdkankan.common.response.PageInfo;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -12,7 +13,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SceneCooperationParamVO {
+public class SceneCooperationParamVO extends PageInfo {
 
     private Long id;
 

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

@@ -68,6 +68,11 @@ public class SceneEditInfoParamVO {
      */
     private String description;
 
+    /**
+     * 加载logo文件名
+     */
+    private String loadingLogo;
+
 
     private SceneEditControlsParamVO controls;
 

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

@@ -137,6 +137,11 @@ public class SceneInfoVO {
      */
     private Integer tags;
 
+    /**
+     * 加载logo文件名
+     */
+    private String loadingLogo;
+
 
 
 

4dkankan-common/pom.xml

@@ -152,6 +152,12 @@
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+            <version>3.4.3.4</version>
+        </dependency>
+
     </dependencies>
 
     <build>

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

@@ -2,6 +2,7 @@ package com.fdkankan.common.response;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.response.ResultData;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
@@ -35,6 +36,12 @@ public class BaseResponseAdvice implements ResponseBodyAdvice<Object> {
         if(body instanceof String){
             return JSONObject.toJSONString(ResultData.ok(body));
         }
+        if(body instanceof Page){
+            Page page = (Page) body;
+            return new PageInfo(page.getCurrent(), page.getSize(), page.getTotal(), page.getRecords());
+
+        }
+
         if (body instanceof ResultData) {
             return body;
         } else {