lyhzzz 2 years ago
parent
commit
9f53011347

+ 279 - 0
src/main/java/com/fdkankan/agent/entity/Scene.java

@@ -0,0 +1,279 @@
+package com.fdkankan.agent.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-11-22
+ */
+@Getter
+@Setter
+@TableName("t_scene")
+public class Scene implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 场景名称
+     */
+    @TableField("scene_name")
+    private String sceneName;
+
+    /**
+     * 场景描述
+     */
+    @TableField("scene_dec")
+    private String sceneDec;
+
+    /**
+     * 场景的链接地址
+     */
+    @TableField("web_site")
+    private String webSite;
+
+    /**
+     * 场景缩略图
+     */
+    @TableField("thumb")
+    private String thumb;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 0表示未建好,1表示建好,-1表示出错,-2表示不要在官网上显示
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 原始的大场景数据(七牛)
+     */
+    @TableField("data_source")
+    private String dataSource;
+
+    /**
+     * 用户表t_user的id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 0表示未付款,1表示付款了,-1表示欠费
+     */
+    @TableField("pay_status")
+    private Integer payStatus;
+
+    /**
+     * 相机主表t_camera的id
+     */
+    @TableField("camera_id")
+    private Long cameraId;
+
+    /**
+     * 手机id
+     */
+    @TableField("phone_id")
+    private String phoneId;
+
+    /**
+     * 大场景序号
+     */
+    @TableField("num")
+    private String num;
+
+    /**
+     * 大场景的密钥
+     */
+    @TableField("scene_key")
+    private String sceneKey;
+
+    /**
+     * 0表示其他,1表示文博,2表示地产,3表示电商,4表示餐饮,5表示家居
+     */
+    @TableField("scene_type")
+    private Integer sceneType;
+
+    /**
+     * 1表示推荐,0表示正常
+     */
+    @TableField("recommend")
+    private Integer recommend;
+
+    /**
+     * 浏览次数
+     */
+    @TableField("view_count")
+    private Integer viewCount;
+
+    /**
+     * 版本
+     */
+    @TableField("version")
+    private Integer version;
+
+    /**
+     * 表示缩略图是否存在
+     */
+    @TableField("thumb_status")
+    private Integer thumbStatus;
+
+    /**
+     * 0表示默认,1表示自己上传
+     */
+    @TableField("floor_logo")
+    private String floorLogo;
+
+    /**
+     * 标记大小
+     */
+    @TableField("floor_logo_size")
+    private Integer floorLogoSize;
+
+    /**
+     * 要上传的热点的id集合,用逗号隔开
+     */
+    @TableField("hots_ids")
+    private String hotsIds;
+
+    /**
+     * 表示初始点信息
+     */
+    @TableField("entry")
+    private String entry;
+
+    /**
+     * 拍摄数量
+     */
+    @TableField("shoot_count")
+    private Integer shootCount;
+
+    /**
+     * 风格
+     */
+    @TableField("style")
+    private Integer style;
+
+    /**
+     * 要gps定位
+     */
+    @TableField("gps")
+    private String gps;
+
+    /**
+     * 方案:1是双目,2是转台,3是六目,4是八目
+     */
+    @TableField("scene_scheme")
+    private Integer sceneScheme;
+
+    /**
+     * 背景音乐名称
+     */
+    @TableField("bg_music")
+    private String bgMusic;
+
+    /**
+     * 记录的状态,A: 生效,I: 禁用
+     */
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 普通录屏文件地址
+     */
+    @TableField("screencap_voice_src")
+    private String screencapVoiceSrc;
+
+    /**
+     * 旧版录屏数据地址
+     */
+    @TableField("screencap_music")
+    private String screencapMusic;
+
+    /**
+     * 录屏文件个数
+     */
+    @TableField("screencap_len")
+    private Integer screencapLen;
+
+    /**
+     * 录音文件地址
+     */
+    @TableField("screencap_voice_sound")
+    private String screencapVoiceSound;
+
+    /**
+     * 选择的类型,sound为screencapVoiceSound,file为screencapVoiceSrc
+     */
+    @TableField("screencap_voice_type")
+    private String screencapVoiceType;
+
+    /**
+     * 录屏文件地址
+     */
+    @TableField("play_data")
+    private String playData;
+
+    /**
+     * 算法类型
+     */
+    @TableField("algorithm")
+    private String algorithm;
+
+    /**
+     * oss服务商
+     */
+    @TableField("oss")
+    private String oss;
+
+    /**
+     * 重新建模的版本
+     */
+    @TableField("floor_edit_ver")
+    private Integer floorEditVer;
+
+    /**
+     * 正式发布重新建模的版本
+     */
+    @TableField("floor_publish_ver")
+    private Integer floorPublishVer;
+
+    /**
+     * 使用容量
+     */
+    @TableField("space")
+    private Long space;
+
+    /**
+     * 录屏图片存放文件
+     */
+    @TableField("screencap_thumb")
+    private String screencapThumb;
+
+
+}

+ 1 - 1
src/main/java/com/fdkankan/agent/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"agent", getTables(new String[]{
-                "t_folder_scene",
+                "t_scene",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

+ 22 - 0
src/main/java/com/fdkankan/agent/mapper/ISceneMapper.java

@@ -0,0 +1,22 @@
+package com.fdkankan.agent.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.agent.entity.Scene;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.agent.request.SceneParam;
+import com.fdkankan.agent.response.SceneVo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 场景表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-22
+ */
+@Mapper
+public interface ISceneMapper extends BaseMapper<Scene> {
+
+    Page<SceneVo> pageList(Page<Object> page, SceneParam param);
+}

+ 18 - 0
src/main/java/com/fdkankan/agent/service/ISceneService.java

@@ -0,0 +1,18 @@
+package com.fdkankan.agent.service;
+
+import com.fdkankan.agent.entity.Scene;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.agent.request.SceneParam;
+
+/**
+ * <p>
+ * 场景表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-22
+ */
+public interface ISceneService extends IService<Scene> {
+
+    Object pageList(SceneParam param);
+}

+ 5 - 0
src/main/java/com/fdkankan/agent/service/impl/SceneProServiceImpl.java

@@ -65,6 +65,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     MangerUploadToOssUtil mangerUploadToOssUtil;
     @Autowired
     IFolderSceneService folderSceneService;
+    @Autowired
+    ISceneService sceneService;
 
 
     @Override
@@ -72,6 +74,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(param.getType() == 2){  //深时
             return laserService.pageList(param);
         }
+        if(param.getType() == 3){
+            return sceneService.pageList(param);
+        }
         Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
 //        for (SceneVo record : page.getRecords()) {
 //            record.setStatusString(SceneStatusUtil.getStatusString(record));

+ 37 - 0
src/main/java/com/fdkankan/agent/service/impl/SceneServiceImpl.java

@@ -0,0 +1,37 @@
+package com.fdkankan.agent.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.agent.common.PageInfo;
+import com.fdkankan.agent.entity.Scene;
+import com.fdkankan.agent.mapper.ISceneMapper;
+import com.fdkankan.agent.request.SceneParam;
+import com.fdkankan.agent.response.SceneVo;
+import com.fdkankan.agent.service.ISceneService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.agent.util.SceneStatusUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 场景表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-22
+ */
+@Service
+public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implements ISceneService {
+
+    @Override
+    public Object pageList(SceneParam param) {
+        Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(), param.getPageSize()), param);
+//        for (SceneVo record : page.getRecords()) {
+//            record.setStatusString(SceneStatusUtil.getStatusString(record));
+//            if(StringUtils.isNotBlank(record.getCopyTime())){
+//                record.setIsCopy(true);
+//            }
+//        }
+        return PageInfo.PageInfo(page);
+    }
+}

+ 38 - 0
src/main/resources/mapper/agent/SceneMapper.xml

@@ -0,0 +1,38 @@
+<?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.agent.mapper.ISceneMapper">
+
+    <select id="pageList" resultType="com.fdkankan.agent.response.SceneVo">
+        select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize,cl.old_num,cl.create_time ,u.user_name,s.view_count,s.status,s.pay_status,
+        s.web_site as thumb ,cl.create_time  as copy_time
+        from t_scene s
+        left join t_scene_copy_log cl on s.num = cl.new_num
+        left join t_user u on s.user_id = u.id
+        left join t_camera c on s.camera_id = c.id
+        left join t_camera_detail d on c.id = d.camera_id
+        left join t_company co on d.company_id = co.id
+        where s.rec_status = 'A'
+        <if test="param.sceneName != null and param.sceneName!='' ">
+            and s.scene_name like concat ('%',#{param.sceneName},'%')
+        </if>
+        <if test="param.snCode != null and param.snCode !='' ">
+            and c.sn_code like concat ('%',#{param.snCode},'%')
+        </if>
+        <if test="param.userName != null and param.userName !='' ">
+            and u.user_name like concat ('%',#{param.userName},'%')
+        </if>
+        <if test="param.type !=null and param.type == 0">
+            and s.scene_source in (1,2,12,13,14)
+        </if>
+        <if test="param.type !=null and param.type == 1">
+            and s.scene_source = 3
+        </if>
+        <if test="param.companyId !=null ">
+            and co.id = #{param.companyId}
+        </if>
+        <if test="param.agentId !=null ">
+            and d.agent_id = #{param.agentId}
+        </if>
+        order by s.id desc
+    </select>
+</mapper>

+ 3 - 0
src/main/resources/mapper/agent/SceneProMapper.xml

@@ -48,6 +48,9 @@
         <if test="param.companyId !=null ">
             and co.id = #{param.companyId}
         </if>
+        <if test="param.agentId !=null ">
+            and d.agent_id = #{param.agentId}
+        </if>
     </sql>
 
 </mapper>