1

src/main/java/com/fdkankan/fusion/common/FilePath.java

@@ -23,4 +23,6 @@ public class FilePath {
     public final static String OFFLINE_OSS_PATH = OFFLINE_PACKAGE_PATH + "%s/env/www";
     public final static String OFFLINE_LASER_OSS_PATH =  "/swss/%s/env/www/%s/";
     public final static String LASER_OSS_PATH = "laser-prod/%s/data/%s/webcloud";
+    public final static String MESH_SCENE_FLOOR_PNG_PATH = "scene_view_data/%s/user/floor-upload-%s.png";
+    public final static String MESH_SCENE_FLOOR_JSON_PATH = "scene_edit_data/%s/user/floorplan.json";
 }

src/main/java/com/fdkankan/fusion/controller/CaseController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.fusion.controller;
 
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.fusion.aop.PushJm;
@@ -8,6 +9,8 @@ import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.entity.*;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.httpClient.client.FdKKClient;
+import com.fdkankan.fusion.httpClient.request.ManageSceneParam;
 import com.fdkankan.fusion.request.CaseParam;
 import com.fdkankan.fusion.response.CaseVo;
 import com.fdkankan.fusion.response.FusionAndSceneVo;
@@ -41,6 +44,8 @@ public class CaseController extends BaseController{
     ICaseNumService caseNumService;
     @Autowired
     IScenePlusService scenePlusService;
+    @Autowired
+    FdKKClient fdKKClient;
 
     @PostMapping("/list")
     public ResultData list(@RequestBody CaseParam param ){
@@ -58,9 +63,9 @@ public class CaseController extends BaseController{
     }
 
     @PostMapping("/sceneListPost")
-    public ResultData sceneListPost(@RequestBody CaseParam param ){
-        param.setTypeList(Arrays.asList(0,1,4,6,7));
-        return ResultData.ok(caseService.sceneList(param));
+    public ResultData sceneListPost(@RequestBody ManageSceneParam param ){
+
+        return fdKKClient.mangeSceneList(param, StpUtil.getTokenValue());
     }
     @PostMapping("/addOrUpdate")
     @PushJm(event_content = "添加案件")

src/main/java/com/fdkankan/fusion/controller/CaseOverviewController.java

@@ -2,10 +2,12 @@ package com.fdkankan.fusion.controller;
 
 
 import com.fdkankan.fusion.aop.PushJm;
+import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.common.util.FileMd5Util;
 import com.fdkankan.fusion.common.util.MD5Checksum;
+import com.fdkankan.fusion.common.util.UploadToOssUtil;
 import com.fdkankan.fusion.config.FusionConfig;
 import com.fdkankan.fusion.entity.CaseEntity;
 import com.fdkankan.fusion.entity.CaseOverview;
@@ -43,6 +45,8 @@ public class CaseOverviewController {
     OtherClient otherClient;
     @Autowired
     ICaseTabulationService caseTabulationService;
+    @Autowired
+    UploadToOssUtil uploadToOssUtil;
 
 
     @GetMapping("/getByCaseId")
@@ -52,11 +56,21 @@ public class CaseOverviewController {
     }
 
     @GetMapping("/info")
-    public ResultData info (@RequestParam (required = false) String overviewId){
-        CaseOverview caseOverview = caseOverviewService.getById(overviewId);
-        if(caseOverview == null){
-            throw new BusinessException(ResultCode.RECORD_NOT_EXIST);
+    public ResultData info (@RequestParam (required = false) Integer overviewId,
+                            @RequestParam (required = false) String num,
+                            @RequestParam (required = false,defaultValue = "0") Integer subGroup){
+        CaseOverview caseOverview = null;
+        if(overviewId != null){
+            caseOverview = caseOverviewService.getById(overviewId);
+            if(caseOverview == null){
+                throw new BusinessException(ResultCode.RECORD_NOT_EXIST);
+            }
+            return ResultData.ok(caseOverview);
+        }
+        if(StringUtils.isNotBlank(num)){
+
         }
+
         return ResultData.ok(caseOverview);
     }
 

src/main/java/com/fdkankan/fusion/httpClient/client/FdKKClient.java

@@ -3,11 +3,9 @@ package com.fdkankan.fusion.httpClient.client;
 import com.alibaba.fastjson.JSONObject;
 import com.dtflys.forest.annotation.*;
 import com.fdkankan.fusion.common.PageInfo;
+import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.httpClient.address.FdkkAddressSource;
-import com.fdkankan.fusion.httpClient.request.FdRoomAddParam;
-import com.fdkankan.fusion.httpClient.request.FdkkCameraParam;
-import com.fdkankan.fusion.httpClient.request.FdkkDelNumParam;
-import com.fdkankan.fusion.httpClient.request.FdkkLoginRequest;
+import com.fdkankan.fusion.httpClient.request.*;
 import com.fdkankan.fusion.httpClient.response.FdRoomVo;
 import com.fdkankan.fusion.httpClient.response.FdkkLoginVo;
 import com.fdkankan.fusion.httpClient.response.FdkkResponse;
@@ -113,4 +111,8 @@ public interface FdKKClient {
 
     @Get("/service/manage/inner/checkCaseAuth/{caseId}")
     JSONObject checkCaseAuth( @Var("caseId")Integer caseId,@Header("token") String token);
+
+
+    @Post("/service/manage/scene/list")
+    ResultData mangeSceneList(@JSONBody ManageSceneParam manageSceneList , @Header("token") String token);
 }

src/main/java/com/fdkankan/fusion/httpClient/request/ManageSceneParam.java

@@ -0,0 +1,11 @@
+package com.fdkankan.fusion.httpClient.request;
+
+import com.fdkankan.fusion.common.RequestBase;
+import lombok.Data;
+
+@Data
+public class ManageSceneParam extends RequestBase {
+    private Integer isObj =1;
+    private String sceneName;
+    private Integer sceneStatus = -2;
+}