1

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

@@ -3,6 +3,7 @@ package com.fdkankan.fusion.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.dtflys.forest.annotation.Post;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.entity.TmProject;
 import com.fdkankan.fusion.exception.BusinessException;
@@ -41,10 +42,14 @@ public class CaseController extends BaseController{
      * 案件关联场景数据
      */
     @GetMapping("/sceneList")
-    public ResultData sceneList(@RequestParam(required = false) Integer caseId ,@RequestParam(required = false) Integer isMesh){
+    public ResultData sceneList(@RequestParam(required = false) Integer caseId ){
         CaseParam param = new CaseParam();
         param.setCaseId(caseId);
-        param.setIsMesh(isMesh);
+        return ResultData.ok(caseService.sceneList(param));
+    }
+
+    @PostMapping("/sceneListPost")
+    public ResultData sceneListPost(@RequestBody CaseParam param ){
         return ResultData.ok(caseService.sceneList(param));
     }
 

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

@@ -30,6 +30,12 @@ public class CaseTabulationController {
         return ResultData.ok(caseTabulationService.getByCaseId(caseId));
     }
 
+    @GetMapping("/getByOverviewId")
+    public ResultData getByOverviewId (@RequestParam(required = false) String overviewId){
+
+        return ResultData.ok(caseTabulationService.getByOverviewId(overviewId));
+    }
+
     @PostMapping("/addOrUpdate")
     public ResultData addOrUpdate (@RequestBody CaseTabulation caseTabulation){
         caseTabulationService.saveOrUpdate(caseTabulation);

src/main/java/com/fdkankan/fusion/entity/CaseTabulation.java

@@ -55,6 +55,9 @@ public class CaseTabulation implements Serializable {
     @TableField("paper_key")
     private String paperKey;
 
+    @TableField("is_auto_gen")
+    private Boolean isAutoGen;
+
     @TableField("tb_status")
     @TableLogic
     private Integer tbStatus;
@@ -65,5 +68,6 @@ public class CaseTabulation implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-
+    @TableField("overview_id")
+    private Integer overviewId;
 }

src/main/java/com/fdkankan/fusion/entity/ScenePlus.java

@@ -116,5 +116,9 @@ public class ScenePlus implements Serializable {
     @TableLogic(value = "A",delval = "I")
     private String recStatus;
 
+    @TableField("has_ai")
+    private Integer hasAi;
 
+    @TableField("has_floorplan_ai")
+    private Integer hasFloorplanAi;
 }

src/main/java/com/fdkankan/fusion/entity/ScenePlusExt.java

@@ -189,6 +189,17 @@ public class ScenePlusExt implements Serializable {
     @TableField("is_obj")
     private Integer isObj;
 
+    /**
+     * 模型方向（只有激光场景才有）
+     */
+    @TableField("orientation")
+    private String orientation;
+
+    /**
+     * laser推送经纬度信息
+     */
     @TableField("rtk_location")
     private String rtkLocation;
+
+
 }

src/main/java/com/fdkankan/fusion/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"fusion", getTables(new String[]{
-               "t_case_tabulation"
+               "t_case_overview_tabulation"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/fusion/request/CaseParam.java

@@ -22,4 +22,6 @@ public class CaseParam extends RequestBase {
     private Boolean mapShow;
 
     private Integer isMesh;
+
+    private String sceneName;
 }

src/main/java/com/fdkankan/fusion/service/ICaseTabulationService.java

@@ -16,4 +16,6 @@ import java.util.List;
 public interface ICaseTabulationService extends IService<CaseTabulation> {
 
     List<CaseTabulation> getByCaseId(String caseId);
+
+    List<CaseTabulation> getByOverviewId(String overviewId);
 }

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

@@ -22,4 +22,5 @@ public interface IScenePlusService extends IService<ScenePlus> {
     List<DataGroupVo> groupByCameraId(DataParam param, List<Long> cameraIds);
 
     List<DataGroupVo> groupByType(DataParam param, List<Long> cameraIds);
+
 }

src/main/java/com/fdkankan/fusion/service/impl/CaseServiceImpl.java

@@ -159,6 +159,7 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
             scenePram.setPageSize(99999);
             scenePram.setNumList(param.getTypeMap().get(type));
             scenePram.setShare("1");
+            scenePram.setSceneName(param.getSceneName());
             PageInfo pageInfo = sceneService.pageList(scenePram);
             List<SceneVo> list1 = (List<SceneVo>) pageInfo.getList();
             listAll.addAll(list1);

src/main/java/com/fdkankan/fusion/service/impl/CaseTabulationServiceImpl.java

@@ -27,4 +27,12 @@ public class CaseTabulationServiceImpl extends ServiceImpl<ICaseTabulationMapper
         wrapper.orderByDesc(CaseTabulation::getId);
         return this.list(wrapper);
     }
+
+    @Override
+    public List<CaseTabulation> getByOverviewId(String overviewId) {
+        LambdaQueryWrapper<CaseTabulation> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CaseTabulation::getOverviewId,overviewId);
+        wrapper.orderByDesc(CaseTabulation::getId);
+        return this.list(wrapper);
+    }
 }