lyhzzz 1 rok pred
rodič
commit
835a0ade54

+ 25 - 0
src/main/java/com/fdkankan/manage/controller/SceneController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.controller;
 
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
@@ -8,6 +9,9 @@ import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.ScenePlus;
 import com.fdkankan.manage.entity.ScenePro;
 import com.fdkankan.manage.httpClient.client.FdKKClient;
+import com.fdkankan.manage.httpClient.client.LaserClient;
+import com.fdkankan.manage.httpClient.param.LaserSceneParam;
+import com.fdkankan.manage.httpClient.vo.FdkkResponse;
 import com.fdkankan.manage.service.IDownService;
 import com.fdkankan.manage.service.IScenePlusService;
 import com.fdkankan.manage.service.ISceneProService;
@@ -37,6 +41,8 @@ public class SceneController {
     IDownService downService;
    @Autowired
     FdKKClient fdKKClient;
+   @Autowired
+    LaserClient laserClient;
 
     @PostMapping("/list")
     public ResultData list(@RequestBody SceneParam param){
@@ -139,5 +145,24 @@ public class SceneController {
 
         return ResultData.ok();
     }
+
+    @PostMapping("/sceneDetail")
+    public ResultData sceneDetail(@RequestBody LaserSceneParam param){
+        FdkkResponse fdkkResponse = laserClient.sceneDetail(param, StpUtil.getTokenValue());
+        if(fdkkResponse.getCode() != 200){
+            throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
+        }
+        return ResultData.ok(fdkkResponse.getData());
+    }
+
+    @PostMapping("/buildSceneObj")
+    public ResultData buildSceneObj(@RequestBody LaserSceneParam param){
+
+        FdkkResponse fdkkResponse = laserClient.buildSceneObj(param, StpUtil.getTokenValue());
+        if(fdkkResponse.getCode() != 200){
+            throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
+        }
+        return ResultData.ok();
+    }
 }
 

+ 9 - 0
src/main/java/com/fdkankan/manage/httpClient/client/LaserClient.java

@@ -55,4 +55,13 @@ public interface LaserClient {
      */
     @Post("/laser/init/{sceneNum}/saveOrEdit")
     Result saveOrEdit(@Var("sceneNum") String sceneNum, @JSONBody  Map<String,Object> params);
+
+    /**
+     * 点云生成obj场景
+     */
+    @Post("/laser/4dage/scene/buildSceneObj")
+    FdkkResponse buildSceneObj(@JSONBody LaserSceneParam param,@Header ("fdToken") String token);
+
+    @Post("/laser/4dage/sceneDetail")
+    FdkkResponse sceneDetail(@JSONBody LaserSceneParam param, @Header ("fdToken") String fdToken);
 }

+ 1 - 0
src/main/java/com/fdkankan/manage/httpClient/param/LaserSceneParam.java

@@ -16,4 +16,5 @@ public class LaserSceneParam {
     private Integer sceneSource = 4;
     private List<String> sceneCodes;
 
+    private Integer id;
 }

+ 1 - 0
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -333,6 +333,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             if(sceneVo !=null){
                 record.setViewCount(sceneVo.getViewCount());
                 record.setWebSite(sceneVo.getWebSite());
+                record.setId(sceneVo.getId());
             }
 
             if(map !=null ){

+ 2 - 0
src/main/java/com/fdkankan/manage/vo/response/SceneVo.java

@@ -28,4 +28,6 @@ public class SceneVo {
 
     private String webSite;
 
+    private Integer id;
+
 }