Merge remote-tracking branch 'origin/master'

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

@@ -170,5 +170,10 @@ public class SceneJsonBean {
      */
     private Float floorPlanCompass;
 
+    /**
+     * 是否保存导览
+     */
+    private Integer tours;
+
 
 }

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

@@ -50,6 +50,12 @@ public class SceneEditInfoExt {
     private String vrNum;
 
     /**
+     * 是否有保存导览（0-否，1-是）
+     */
+    @TableField("tours")
+    private Integer tours;
+
+    /**
      * 创建时间
      */
     @TableField("create_time")

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneEditInfoExtService.java

@@ -19,4 +19,6 @@ public interface ISceneEditInfoExtService extends IService<SceneEditInfoExt> {
 
     SceneEditInfoExt getByEditInfoId(long editInfoId);
 
+    void updateToursByNum(String num, Integer tours);
+
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoExtServiceImpl.java

@@ -2,9 +2,18 @@ package com.fdkankan.scene.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.common.constant.CommonStatus;
+import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.scene.entity.SceneEditInfo;
 import com.fdkankan.scene.entity.SceneEditInfoExt;
+import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.mapper.ISceneEditInfoExtMapper;
 import com.fdkankan.scene.service.ISceneEditInfoExtService;
+import com.fdkankan.scene.service.ISceneEditInfoService;
+import com.fdkankan.scene.service.IScenePlusService;
+import java.util.Objects;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -18,6 +27,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class SceneEditInfoExtServiceImpl extends ServiceImpl<ISceneEditInfoExtMapper, SceneEditInfoExt> implements ISceneEditInfoExtService {
 
+    @Autowired
+    private IScenePlusService scenePlusService;
+    @Autowired
+    private ISceneEditInfoService sceneEditInfoService;
+
     @Override
     public SceneEditInfoExt getBySceneProId(long sceneProId) {
         return this.getOne(new LambdaQueryWrapper<SceneEditInfoExt>().eq(SceneEditInfoExt::getSceneProId, sceneProId));
@@ -32,4 +46,16 @@ public class SceneEditInfoExtServiceImpl extends ServiceImpl<ISceneEditInfoExtMa
     public SceneEditInfoExt getByEditInfoId(long editInfoId) {
         return this.getOne(new LambdaQueryWrapper<SceneEditInfoExt>().eq(SceneEditInfoExt::getEditInfoId, editInfoId));
     }
+
+    @Override
+    public void updateToursByNum(String num, Integer tours) {
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+        if(Objects.isNull(scenePlus)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+        SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
+        SceneEditInfoExt sceneEditInfoExt = this.getByEditInfoId(sceneEditInfo.getId());
+        sceneEditInfoExt.setTours(tours);
+        this.updateById(sceneEditInfoExt);
+    }
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.PayStatus;
 import com.fdkankan.common.constant.SceneStatus;
@@ -20,7 +21,11 @@ import com.fdkankan.platform.api.feign.PlatformGoodsClient;
 import com.fdkankan.platform.api.feign.PlatformUserClient;
 import com.fdkankan.platform.api.dto.Camera;
 import com.fdkankan.platform.api.dto.UserIncrement;
+import com.fdkankan.scene.entity.SceneEditInfo;
+import com.fdkankan.scene.entity.SceneEditInfoExt;
 import com.fdkankan.scene.entity.ScenePlus;
+import com.fdkankan.scene.service.ISceneEditInfoExtService;
+import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.ISceneEditService;
 import com.fdkankan.scene.service.IScenePlusService;
 import com.fdkankan.scene.service.ISceneProService;
@@ -51,6 +56,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class SceneEditServiceImpl implements ISceneEditService {
 
+    @Value("${oss.bucket:4dkankan}")
+    private String bucket;
     @Autowired
     ISceneProService sceneProService;
     @Autowired
@@ -61,10 +68,12 @@ public class SceneEditServiceImpl implements ISceneEditService {
     IScenePlusService scenePlusService;
     @Autowired
     private UploadToOssUtil uploadToOssUtil;
-    @Value("${oss.bucket:4dkankan}")
-    private String bucket;
     @Autowired
     private ISceneUploadService sceneUploadService;
+    @Autowired
+    private ISceneEditInfoService sceneEditInfoService;
+    @Autowired
+    private ISceneEditInfoExtService sceneEditInfoExtService;
 
     @Override
     public SceneAuthVO getAuth(BaseSceneParamVO param) throws Exception{
@@ -128,6 +137,10 @@ public class SceneEditServiceImpl implements ISceneEditService {
     public ResultData saveTour(BaseDataParamVO param) throws IOException {
         String key = String.format(UploadFilePath.USER_EDIT_PATH, param.getNum()) + "tour.json";
         uploadToOssUtil.upload(param.getData().getBytes(StandardCharsets.UTF_8), key);
+
+        sceneEditInfoExtService.updateToursByNum(
+            param.getNum(), Integer.valueOf(CommonStatus.YES.code()));
+
         return ResultData.ok();
     }
 
@@ -150,7 +163,6 @@ public class SceneEditServiceImpl implements ISceneEditService {
                     }
                 }
 
-
                 JSONObject exit = tour.getJSONObject("exit");
                 if(Objects.nonNull(exit)){
                     String exitOver = exit.getString("cover");
@@ -176,6 +188,9 @@ public class SceneEditServiceImpl implements ISceneEditService {
         //删除tour.json文件
         uploadToOssUtil.delete(tourJsonPath);
 
+        sceneEditInfoExtService.updateToursByNum(
+            param.getNum(), Integer.valueOf(CommonStatus.NO.code()));
+
         return ResultData.ok();
     }
 }

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

@@ -157,6 +157,11 @@ public class SceneInfoVO {
      */
     private Float floorPlanCompass;
 
+    /**
+     * 是否保存导览
+     */
+    private Integer tours;
+