Selaa lähdekoodia

场景编辑保存、发布接口

dengsixing 3 vuotta sitten
vanhempi
commit
f19ee11a50
24 muutettua tiedostoa jossa 922 lisäystä ja 7 poistoa
  1. 87 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/bean/SceneJsonBean.java
  2. 8 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneController.java
  3. 34 1
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneEditController.java
  4. 21 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneEditControlsController.java
  5. 21 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneEditInfoController.java
  6. 96 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneEditControls.java
  7. 102 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneEditInfo.java
  8. 2 2
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/generate/AutoGenerate.java
  9. 18 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/mapper/ISceneEditControlsMapper.java
  10. 18 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/mapper/ISceneEditInfoMapper.java
  11. 18 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneEditControlsService.java
  12. 27 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneEditInfoService.java
  13. 1 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneProService.java
  14. 28 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditControlsServiceImpl.java
  15. 127 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java
  16. 14 3
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java
  17. 65 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneEditControlsParamVO.java
  18. 55 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneEditControlsVO.java
  19. 73 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneEditInfoParamVO.java
  20. 82 0
      4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneEditInfoVO.java
  21. 10 1
      4dkankan-center-scene/src/main/resources/bootstrap.yml
  22. 5 0
      4dkankan-center-scene/src/main/resources/mapper/scene/SceneEditControlsMapper.xml
  23. 5 0
      4dkankan-center-scene/src/main/resources/mapper/scene/SceneEditInfoMapper.xml
  24. 5 0
      4dkankan-center-scene/src/main/resources/mapper/test/SceneEditInfoMapper.xml

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

@@ -0,0 +1,87 @@
+package com.fdkankan.scene.bean;
+
+import com.fdkankan.scene.vo.SceneEditControlsVO;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * scene.json实体类
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/1/19
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SceneJsonBean {
+
+    /**
+     * 场景码
+     */
+    private String num;
+
+    /**
+     * 地面logo名称
+     */
+    private String floorLogoName;
+
+    /**
+     * 地面logo上传地址
+     */
+    private String floorLogoPath;
+
+    /**
+     * 地面logo大小
+     */
+    private Integer floorLogoSize;
+
+    /**
+     * 背景音乐名称
+     */
+    private String musicName;
+
+    /**
+     * 背景音乐上传地址
+     */
+    private String musicPath;
+
+    /**
+     * 浏览密码
+     */
+    private String scenePassword;
+
+    /**
+     * 场景标题
+     */
+    private String title;
+
+    /**
+     * 场景描述
+     */
+    private String description;
+
+    private SceneEditControlsVO controls;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 点位数量
+     */
+    private Integer panoCount;
+
+    /**
+     * 球幕视频数量
+     */
+    private Integer videoCount;
+
+}

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

@@ -50,6 +50,14 @@ public class SceneController {
     IPicSceneProgressService picSceneProgressService;
 
 
+//    /**
+//     * 获取场景详情
+//     */
+//    @PostMapping(value = "/getInfo")
+//    public SceneVO getInfo(@RequestBody SceneParamVO param){
+//        return sceneProService.getInfo(param.getSceneNum());
+//    }
+
     /**
      * 获取场景详情
      */

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

@@ -1,7 +1,10 @@
 package com.fdkankan.scene.controller;
 
 import com.fdkankan.common.controller.BaseController;
+import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.ISceneProService;
+import com.fdkankan.scene.vo.SceneEditInfoParamVO;
+import com.fdkankan.scene.vo.SceneEditInfoVO;
 import com.fdkankan.scene.vo.SceneEditParamVO;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.vo.FileParamVO;
@@ -21,10 +24,12 @@ public class SceneEditController extends BaseController {
 
     @Autowired
     private ISceneProService sceneProService;
+    @Autowired
+    private ISceneEditInfoService sceneEditInfoService;
 
     /**
      * <p>
-        保存编辑的数据并生效
+        保存编辑的数据
      * </p>
      * @author dengsixing
      * @date 2022/1/12
@@ -38,6 +43,34 @@ public class SceneEditController extends BaseController {
 
     /**
      * <p>
+     保存场景编辑数据
+     * </p>
+     * @author dengsixing
+     * @date 2022/1/12
+     * @param sceneEditParamVO
+     * @return com.fdkankan.common.response.ResultData
+     **/
+    @PostMapping(value = "/saveSceneEditInfo")
+    public SceneEditInfoVO saveSceneEditInfo(@RequestBody SceneEditInfoParamVO param){
+        return sceneEditInfoService.saveSceneEditInfo(param);
+    }
+
+    /**
+     * <p>
+     发布场景数据
+     * </p>
+     * @author dengsixing
+     * @date 2022/1/12
+     * @param sceneEditParamVO
+     * @return com.fdkankan.common.response.ResultData
+     **/
+    @PostMapping(value = "/publicScene")
+    public ResultData publicScene(@RequestBody SceneEditParamVO sceneEditParamVO) throws Exception {
+        return sceneEditInfoService.publicScene(sceneEditParamVO);
+    }
+
+    /**
+     * <p>
         单独保存tourList
      * </p>
      * @author dengsixing

+ 21 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneEditControlsController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.scene.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-01-18
+ */
+@RestController
+@RequestMapping("/scene/sceneEditControls")
+public class SceneEditControlsController {
+
+}
+

+ 21 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneEditInfoController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.scene.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-01-18
+ */
+@RestController
+@RequestMapping("/scene/sceneEditInfo")
+public class SceneEditInfoController {
+
+}
+

+ 96 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneEditControls.java

@@ -0,0 +1,96 @@
+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 lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2022-01-18
+ */
+@Getter
+@Setter
+@TableName("t_scene_edit_controls")
+public class SceneEditControls implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * t_scene_edit_info表id
+     */
+    @TableField("edit_info_id")
+    private Long editInfoId;
+
+    /**
+     * 是否展示小地图(0-不展示,1-展示)
+     */
+    @TableField("show_map")
+    private Integer showMap;
+
+    /**
+     * 是否需要密码(0-不需要,1-需要)
+     */
+    @TableField("show_lock")
+    private Integer showLock;
+
+    /**
+     * 是否展示标题(0-不需要,1-需要)
+     */
+    @TableField("show_title")
+    private Integer showTitle;
+
+    /**
+     * 是否展示漫游按钮(0-不需要,1-需要)
+     */
+    @TableField("show_panorama")
+    private Integer showPanorama;
+
+    /**
+     * 是否展示3D按钮(0-不需要,1-需要)
+     */
+    @TableField("show_dollhouse")
+    private Integer showDollhouse;
+
+    /**
+     * 是否展示2D按钮(0-不需要,1-需要)
+     */
+    @TableField("show_floorplan")
+    private Integer showFloorplan;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 0-有效,1-删除, 2-禁用
+     */
+    @TableField("tb_status")
+    @TableLogic
+    private Integer tbStatus;
+
+
+}

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

@@ -0,0 +1,102 @@
+package com.fdkankan.scene.entity;
+
+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-19
+ */
+@Getter
+@Setter
+@TableName("t_scene_edit_info")
+public class SceneEditInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @TableField("scene_pro_id")
+    private Long sceneProId;
+
+    /**
+     * 地面logo名称
+     */
+    @TableField("floor_logo_name")
+    private String floorLogoName;
+
+    /**
+     * 地面logo上传地址
+     */
+    @TableField("floor_logo_path")
+    private String floorLogoPath;
+
+    /**
+     * 地面logo大小
+     */
+    @TableField("floor_logo_size")
+    private Integer floorLogoSize;
+
+    /**
+     * 背景音乐名称
+     */
+    @TableField("music_name")
+    private String musicName;
+
+    /**
+     * 背景音乐上传地址
+     */
+    @TableField("music_path")
+    private String musicPath;
+
+    /**
+     * 浏览密码
+     */
+    @TableField("scene_password")
+    private String scenePassword;
+
+    /**
+     * 场景标题
+     */
+    @TableField("title")
+    private String title;
+
+    /**
+     * 场景描述
+     */
+    @TableField("description")
+    private String description;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 0-有效,1-删除, 2-禁用
+     */
+    @TableField("tb_status")
+    @TableLogic
+    private Integer tbStatus;
+
+
+}

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

@@ -20,8 +20,8 @@ public class AutoGenerate {
 
         String path =System.getProperty("user.dir") + "\\4dkankan-center-scene";
 
-        generate(path,"scene", getTables(new String[]{
-                "t_video_scene_progress","t_pic_scene_progress"
+        generate(path,"test", getTables(new String[]{
+                "t_scene_edit_info"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

+ 18 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/mapper/ISceneEditControlsMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.mapper;
+
+import com.fdkankan.scene.entity.SceneEditControls;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-01-18
+ */
+@Mapper
+public interface ISceneEditControlsMapper extends BaseMapper<SceneEditControls> {
+
+}

+ 18 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/mapper/ISceneEditInfoMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.mapper;
+
+import com.fdkankan.scene.entity.SceneEditInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-01-18
+ */
+@Mapper
+public interface ISceneEditInfoMapper extends BaseMapper<SceneEditInfo> {
+
+}

+ 18 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneEditControlsService.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.service;
+
+import com.fdkankan.scene.entity.SceneEditControls;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-01-18
+ */
+public interface ISceneEditControlsService extends IService<SceneEditControls> {
+
+    SceneEditControls getBySceneEditId(long sceneEditInfoId);
+
+}

+ 27 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneEditInfoService.java

@@ -0,0 +1,27 @@
+package com.fdkankan.scene.service;
+
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.scene.entity.SceneEditInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.scene.vo.SceneEditInfoParamVO;
+import com.fdkankan.scene.vo.SceneEditInfoVO;
+import com.fdkankan.scene.vo.SceneEditParamVO;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-01-18
+ */
+public interface ISceneEditInfoService extends IService<SceneEditInfo> {
+
+    SceneEditInfoVO saveSceneEditInfo(SceneEditInfoParamVO param);
+
+    SceneEditInfo getBySceneProId(long sceneProId);
+
+    ResultData publicScene(@RequestBody SceneEditParamVO sceneEditParamVO) throws Exception;
+
+}

+ 1 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneProService.java

@@ -194,4 +194,5 @@ public interface ISceneProService extends IService<ScenePro> {
 
 
 
+
 }

+ 28 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditControlsServiceImpl.java

@@ -0,0 +1,28 @@
+package com.fdkankan.scene.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.constant.TbStatus;
+import com.fdkankan.scene.entity.SceneEditControls;
+import com.fdkankan.scene.mapper.ISceneEditControlsMapper;
+import com.fdkankan.scene.service.ISceneEditControlsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-01-18
+ */
+@Service
+public class SceneEditControlsServiceImpl extends ServiceImpl<ISceneEditControlsMapper, SceneEditControls> implements ISceneEditControlsService {
+
+    @Override
+    public SceneEditControls getBySceneEditId(long sceneEditInfoId) {
+        return this.getOne(new LambdaQueryWrapper<SceneEditControls>()
+                .eq(SceneEditControls::getTbStatus, TbStatus.VALID.code())
+                .eq(SceneEditControls::getEditInfoId, sceneEditInfoId));
+    }
+}

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

@@ -0,0 +1,127 @@
+package com.fdkankan.scene.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.constant.ConstantFilePath;
+import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.TbStatus;
+import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.scene.bean.SceneJsonBean;
+import com.fdkankan.scene.entity.SceneEditControls;
+import com.fdkankan.scene.entity.SceneEditInfo;
+import com.fdkankan.scene.entity.ScenePro;
+import com.fdkankan.scene.mapper.ISceneEditInfoMapper;
+import com.fdkankan.scene.service.ISceneEditControlsService;
+import com.fdkankan.scene.service.ISceneEditInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.scene.service.ISceneProService;
+import com.fdkankan.scene.vo.SceneEditControlsVO;
+import com.fdkankan.scene.vo.SceneEditInfoParamVO;
+import com.fdkankan.scene.vo.SceneEditInfoVO;
+import com.fdkankan.scene.vo.SceneEditParamVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Calendar;
+import java.util.Objects;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-01-18
+ */
+@Service
+public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper, SceneEditInfo> implements ISceneEditInfoService {
+
+    @Autowired
+    private ISceneEditControlsService sceneEditControlsService;
+    @Autowired
+    private ISceneProService sceneProService;
+    @Autowired
+    private UploadToOssUtil uploadToOssUtil;
+
+
+    @Override
+    public SceneEditInfoVO saveSceneEditInfo(SceneEditInfoParamVO param) {
+
+        ScenePro scenePro = sceneProService.findBySceneNum(param.getNum());
+        SceneEditInfo sceneEditInfoDb = this.getBySceneProId(scenePro.getId());
+        SceneEditControls sceneEditControlsDb = null;
+        if(Objects.nonNull(sceneEditInfoDb)){
+            sceneEditControlsDb = sceneEditControlsService.getBySceneEditId(sceneEditInfoDb.getId());
+        }
+
+        SceneEditInfo sceneEditInfo = BeanUtil.copyProperties(param, SceneEditInfo.class);
+        sceneEditInfo.setSceneProId(scenePro.getId());
+        sceneEditInfo.setCreateTime(Calendar.getInstance().getTime());
+        if(Objects.isNull(sceneEditInfoDb)){
+            this.save(sceneEditInfo);
+        }else{
+            sceneEditInfo.setId(sceneEditInfoDb.getId());
+            sceneEditInfo.setUpdateTime(Calendar.getInstance().getTime());
+            this.updateById(sceneEditInfo);
+        }
+
+        SceneEditControls sceneEditControls = BeanUtil.copyProperties(param.getControls(), SceneEditControls.class);
+        sceneEditControls.setEditInfoId(sceneEditInfo.getId());
+        if(Objects.isNull(sceneEditControlsDb)){
+            sceneEditControlsService.save(sceneEditControls);
+        }else{
+            sceneEditControls.setId(sceneEditControlsDb.getId());
+            sceneEditControlsService.updateById(sceneEditControls);
+        }
+
+
+        SceneEditInfoVO result = BeanUtil.copyProperties(param, SceneEditInfoVO.class);
+        result.setCreateTime(sceneEditInfo.getCreateTime());
+
+        return result;
+    }
+
+    @Override
+    public SceneEditInfo getBySceneProId(long sceneProId) {
+        return this.getOne(new LambdaQueryWrapper<SceneEditInfo>()
+                .eq(SceneEditInfo::getTbStatus, TbStatus.VALID.code())
+                .eq(SceneEditInfo::getSceneProId, sceneProId));
+    }
+
+    @Override
+    public ResultData publicScene(SceneEditParamVO sceneEditParamVO) throws Exception {
+        String sceneNum = sceneEditParamVO.getSceneNum();
+        if(StrUtil.isEmpty(sceneNum)){
+            throw new BusinessException(ErrorCode.PARAM_REQUIRED);
+        }
+
+        //根据场景码查询数据库
+        ScenePro scenePro = sceneProService.findBySceneNum(sceneEditParamVO.getSceneNum());
+        SceneEditInfo sceneEditInfo = this.getBySceneProId(scenePro.getId());
+        SceneEditControls sceneEditControls = sceneEditControlsService.getBySceneEditId(sceneEditInfo.getId());
+
+        //生成sceneJson
+        SceneJsonBean sceneJson = BeanUtil.copyProperties(sceneEditInfo, SceneJsonBean.class);
+        SceneEditControlsVO sceneEditControlsVO = BeanUtil.copyProperties(sceneEditControls, SceneEditControlsVO.class);
+        sceneJson.setControls(sceneEditControlsVO);
+        sceneJson.setNum(sceneEditParamVO.getSceneNum());
+
+        //上传sceneJson文件
+//        String sceneJsonPath = String.format(ConstantFilePath.)
+//        uploadToOssUtil.upload();
+
+        //oss文件拷贝
+//        uploadToOssUtil.copyFiles();
+
+
+        //删除没用文件
+
+        //sceneJson放入缓存
+
+        return ResultData.ok();
+    }
+
+}

+ 14 - 3
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -7,6 +7,11 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.model.ListObjectsRequest;
+import com.aliyun.oss.model.OSSObjectSummary;
+import com.aliyun.oss.model.ObjectListing;
+import com.aliyun.oss.model.ObjectMetadata;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -103,6 +108,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     PlatformGoodsClient platformGoodsClient;
     @Autowired
     ISceneProService sceneProService;
+    @Autowired
+    ISceneEditInfoService sceneEditInfoService;
+    @Autowired
+    ISceneEditControlsService sceneEditControlsService;
 
     @Override
     public List<SceneVO> convert(List<ScenePro> list){
@@ -1485,7 +1494,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = findBySceneNum(base.getSceneNum());
+        ScenePro scenePro = this.findBySceneNum(base.getSceneNum());
         if(scenePro == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
@@ -1503,6 +1512,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
         StringBuffer imagesBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(imagesBuf.toString());
 
+
+
         int type = Integer.valueOf(base.getSceneType());
 
         String strsceneInfos = FileUtils.readFile(dataBuffer.toString() + "scene.json");
@@ -2130,6 +2141,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         return ResultData.ok();
     }
 
+
+
     @Override
 //    @SystemServiceLog(description = "上传场景的热点媒体文件")
     public ResultData uploadHotMedia(FileParamVO param, MultipartFile file) throws Exception {
@@ -4949,6 +4962,4 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
 
 
-
-
 }

+ 65 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneEditControlsParamVO.java

@@ -0,0 +1,65 @@
+package com.fdkankan.scene.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/1/18
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SceneEditControlsParamVO implements Serializable {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * t_scene_edit_info表id
+     */
+    private Long editInfoId;
+
+    /**
+     * 是否展示小地图(0-不展示,1-展示)
+     */
+    private Integer showMap;
+
+    /**
+     * 是否需要密码(0-不需要,1-需要)
+     */
+    private Integer showLock;
+
+    /**
+     * 是否展示标题(0-不需要,1-需要)
+     */
+    private Integer showTitle;
+
+    /**
+     * 是否展示漫游按钮(0-不需要,1-需要)
+     */
+    private Integer showPanorama;
+
+    /**
+     * 是否展示3D按钮(0-不需要,1-需要)
+     */
+    private Integer showDollhouse;
+
+    /**
+     * 是否展示2D按钮(0-不需要,1-需要)
+     */
+    private Integer showFloorplan;
+
+
+}

+ 55 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneEditControlsVO.java

@@ -0,0 +1,55 @@
+package com.fdkankan.scene.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/1/18
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SceneEditControlsVO implements Serializable {
+
+    /**
+     * 是否展示小地图(0-不展示,1-展示)
+     */
+    private Integer showMap;
+
+    /**
+     * 是否需要密码(0-不需要,1-需要)
+     */
+    private Integer showLock;
+
+    /**
+     * 是否展示标题(0-不需要,1-需要)
+     */
+    private Integer showTitle;
+
+    /**
+     * 是否展示漫游按钮(0-不需要,1-需要)
+     */
+    private Integer showPanorama;
+
+    /**
+     * 是否展示3D按钮(0-不需要,1-需要)
+     */
+    private Integer showDollhouse;
+
+    /**
+     * 是否展示2D按钮(0-不需要,1-需要)
+     */
+    private Integer showFloorplan;
+
+
+}

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

@@ -0,0 +1,73 @@
+package com.fdkankan.scene.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SceneEditInfoParamVO {
+
+
+    /**
+     * 逐渐
+     */
+    private Long id;
+
+    /**
+     * 场景吗
+     */
+    private String num;
+
+    private Long sceneProId;
+
+    /**
+     * 地面logo名称
+     */
+    private String floorLogoName;
+
+    /**
+     * 地面logo上传地址
+     */
+    private String floorLogoPath;
+
+    /**
+     * 地面logo大小
+     */
+    private Integer floorLogoSize;
+
+    /**
+     * 背景音乐名称
+     */
+    private String musicName;
+
+    /**
+     * 背景音乐上传地址
+     */
+    private String musicPath;
+
+    /**
+     * 浏览密码
+     */
+    private String scenePassword;
+
+    /**
+     * 场景标题
+     */
+    private String title;
+
+    /**
+     * 场景描述
+     */
+    private String description;
+
+
+    private SceneEditControlsParamVO controls;
+
+
+
+
+}

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

@@ -0,0 +1,82 @@
+package com.fdkankan.scene.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SceneEditInfoVO implements Serializable {
+
+    /**
+     * 场景码
+     */
+    private String num;
+
+    /**
+     * 地面logo名称
+     */
+    private String floorLogoName;
+
+    /**
+     * 地面logo上传地址
+     */
+    private String floorLogoPath;
+
+    /**
+     * 地面logo大小
+     */
+    private Integer floorLogoSize;
+
+    /**
+     * 背景音乐名称
+     */
+    private String musicName;
+
+    /**
+     * 背景音乐上传地址
+     */
+    private String musicPath;
+
+    /**
+     * 浏览密码
+     */
+    private String scenePassword;
+
+    /**
+     * 场景标题
+     */
+    private String title;
+
+    /**
+     * 场景描述
+     */
+    private String description;
+
+    private SceneEditControlsVO controls;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 点位数量
+     */
+    private Integer panoCount;
+
+    /**
+     * 球幕视频数量
+     */
+    private Integer videoCount;
+
+
+
+
+}

+ 10 - 1
4dkankan-center-scene/src/main/resources/bootstrap.yml

@@ -1,7 +1,16 @@
 spring:
+  jackson:
+    serialization:
+      FAIL_ON_EMPTY_BEANS: false
   application:
     name: 4dkankan-center-scene
-#  main:
+  servlet:
+    multipart:
+      # 设置单个文件大小
+      max-file-size: 50MB
+    # 设置单次请求文件的总大小
+      max-request-size: 50MB
+  #  main:
 #    allow-bean-definition-overriding: true
   cloud:
     nacos:

+ 5 - 0
4dkankan-center-scene/src/main/resources/mapper/scene/SceneEditControlsMapper.xml

@@ -0,0 +1,5 @@
+<?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.scene.mapper.ISceneEditControlsMapper">
+
+</mapper>

+ 5 - 0
4dkankan-center-scene/src/main/resources/mapper/scene/SceneEditInfoMapper.xml

@@ -0,0 +1,5 @@
+<?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.scene.mapper.ISceneEditInfoMapper">
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?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>