Merge branch 'feature-houseType-20221219'

src/main/java/com/fdkankan/ucenter/controller/SceneController.java

@@ -16,13 +16,7 @@ import com.fdkankan.ucenter.vo.request.SceneParam;
 import com.fdkankan.ucenter.vo.response.DownloadProcessVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -174,6 +168,15 @@ public class SceneController extends BaseController {
         return scenePlusService.pageSceneWithHouseType(param,this.getToken());
     }
 
+    /**
+     *
+     * 根据场景码返回ar路径
+     */
+    @GetMapping("/getArPathByNum")
+    public Result getArPathByNum(@RequestParam(value = "num") String num){
+        return scenePlusService.getArPathByNum(num);
+    }
+
 
 
 }

src/main/java/com/fdkankan/ucenter/service/IScenePlusService.java

@@ -7,6 +7,7 @@ import com.fdkankan.ucenter.entity.ScenePlus;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.vo.ResponseScene;
 import com.fdkankan.ucenter.vo.request.RequestScene;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -43,4 +44,6 @@ public interface IScenePlusService extends IService<ScenePlus> {
     List<ScenePlus> getByIds(List<Long> plusIds);
 
     Result pageSceneWithHouseType(RequestScene param, String token);
+
+    Result getArPathByNum(String num);
 }

src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.CommonStatus;
+import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.image.MatrixToImageWriterUtil;
@@ -336,6 +337,20 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         return Result.success(pageInfo);
     }
 
+    @Override
+    public Result getArPathByNum(String num) {
+        ScenePro scenePro = sceneProService.getByNum(num);
+        if(Objects.nonNull(scenePro)){
+            return Result.success("成功", String.format("images/images%s/ar", num));
+        }
+        ScenePlus scenePlus = this.getByNum(num);
+        if(Objects.nonNull(scenePlus)){
+            return Result.success("成功", String.format(UploadFilePath.IMG_VIEW_PATH, num) + "ar");
+        }
+
+        return Result.failure(ErrorCode.FAILURE_CODE_5005.code(), ErrorCode.FAILURE_CODE_5005.message());
+    }
+
     private String createRoamingPoint(String num){
         String roamingPointOssPath = String.format(UploadFilePath.DATA_VIEW_PATH, num) + "roamingPoint.json";
         String url = null;
@@ -360,4 +375,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
         return url;
     }
+
+
+
 }