modeling service 完善

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/entity/SceneExt.java

@@ -0,0 +1,170 @@
+package com.fdkankan.modeling.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 场景表
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2021-12-30
+ */
+@Getter
+@Setter
+@TableName("t_scene_ext")
+public class SceneExt implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 外键id
+     */
+    @TableField("scene_id")
+    private Long sceneId;
+
+    /**
+     * 要上传的热点的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;
+
+    /**
+     * 普通录屏文件地址
+     */
+    @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;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 0-有效，1-删除
+     */
+    @TableField("tb_status")
+    private Integer tbStatus;
+
+
+}

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/mapper/ISceneExtMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.modeling.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.modeling.entity.SceneExt;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 场景表 Mapper 接口
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2021-12-30
+ */
+@Mapper
+public interface ISceneExtMapper extends BaseMapper<SceneExt> {
+
+}

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneExtService.java

@@ -0,0 +1,18 @@
+package com.fdkankan.modeling.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.modeling.entity.SceneExt;
+
+/**
+ * <p>
+ * 场景表 服务类
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2021-12-30
+ */
+public interface ISceneExtService extends IService<SceneExt> {
+
+    SceneExt getBySceneId(long sceneId);
+
+}

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneExtServiceImpl.java

@@ -0,0 +1,25 @@
+package com.fdkankan.modeling.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.modeling.entity.SceneExt;
+import com.fdkankan.modeling.mapper.ISceneExtMapper;
+import com.fdkankan.modeling.service.ISceneExtService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 场景表 服务实现类
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2021-12-30
+ */
+@Service
+public class SceneExtServiceImpl extends ServiceImpl<ISceneExtMapper, SceneExt> implements ISceneExtService {
+
+    @Override
+    public SceneExt getBySceneId(long sceneId) {
+        return this.getOne(new LambdaQueryWrapper<SceneExt>().eq(SceneExt::getSceneId, sceneId));
+    }
+}

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneProServiceImpl.java

@@ -7,13 +7,11 @@ import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.RecStatus;
 import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.modeling.entity.Scene;
 import com.fdkankan.modeling.entity.ScenePro;
 import com.fdkankan.modeling.entity.SceneProExt;
 import com.fdkankan.modeling.mapper.ISceneProMapper;
 import com.fdkankan.modeling.service.ISceneProExtService;
 import com.fdkankan.modeling.service.ISceneProService;
-import com.fdkankan.modeling.service.ISceneService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,8 +32,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Autowired
     private ISceneProExtService sceneProExtService;
-    @Autowired
-    private ISceneService sceneService;
 
     @Override
     public ScenePro findBySceneNum(String projectNum) {
@@ -51,21 +47,18 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public void updateTime(String projectNum, Long space, int payStatus, String videos, long computeTime) {
-        Scene scene = sceneService.findBySceneNum(projectNum);
         ScenePro scenePro = this.findBySceneNum(projectNum);
         if(scenePro == null){
             return;
         }
         SceneProExt sceneProExt = sceneProExtService.getBySceneProId(scenePro.getId());
-        if(scene == null || sceneProExt == null){
+        if( sceneProExt == null){
             return;
         }
-        scene.setSceneStatus(-2);
-        sceneService.updateById(scene);
-
         scenePro.setVideos(videos);
         this.updateById(scenePro);
 
+        sceneProExt.setSceneStatus(-2);
         sceneProExt.setSpace(space);
         sceneProExt.setComputeTime(computeTime);
         sceneProExtService.updateById(sceneProExt);

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneServiceImpl.java

@@ -5,11 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.modeling.entity.Scene;
-import com.fdkankan.modeling.entity.ScenePro;
-import com.fdkankan.modeling.entity.SceneProExt;
+import com.fdkankan.modeling.entity.SceneExt;
 import com.fdkankan.modeling.mapper.ISceneMapper;
-import com.fdkankan.modeling.service.ISceneProExtService;
-import com.fdkankan.modeling.service.ISceneProService;
+import com.fdkankan.modeling.service.ISceneExtService;
 import com.fdkankan.modeling.service.ISceneService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,25 +21,20 @@ import java.util.List;
 public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implements ISceneService {
 
     @Autowired
-    private ISceneProService sceneProService;
-    @Autowired
-    private ISceneProExtService sceneProExtService;
+    private ISceneExtService sceneExtService;
 
     @Override
     public void updateTime(String projectNum, Long space, int payStatus) {
-        UpdateWrapper<Scene> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().set(Scene::getCreateTime,new Date());
-        updateWrapper.lambda().set(Scene::getSceneStatus,-2);
-        updateWrapper.lambda().set(Scene::getPayStatus,payStatus);
-        updateWrapper.lambda().eq(Scene::getSceneCode,projectNum);
-        this.update(updateWrapper);
-
-        ScenePro scenePro = sceneProService.findBySceneNum(projectNum);
-        if(scenePro != null){
-            SceneProExt sceneProExt = sceneProExtService.getBySceneProId(scenePro.getId());
-            if(sceneProExt != null){
-                sceneProExt.setSpace(space);
-                sceneProExtService.updateById(sceneProExt);
+        Scene scene = this.findBySceneNum(projectNum);
+        if(scene != null){
+            scene.setCreateTime(new Date());
+            scene.setSceneStatus(-2);
+            scene.setPayStatus(payStatus);
+            this.updateById(scene);
+            SceneExt sceneExt = sceneExtService.getBySceneId(scene.getId());
+            if(sceneExt != null){
+                sceneExt.setSpace(space);
+                sceneExtService.updateById(sceneExt);
             }
         }
     }