lyhzzz 3 months ago
parent
commit
38f629025d

+ 2 - 1
src/main/java/com/fdkankan/fusion/controller/CaseController.java

@@ -41,9 +41,10 @@ public class CaseController extends BaseController{
      * 案件关联场景数据
      */
     @GetMapping("/sceneList")
-    public ResultData sceneList(@RequestParam(required = false) Integer caseId ){
+    public ResultData sceneList(@RequestParam(required = false) Integer caseId ,@RequestParam(required = false) Integer isMesh){
         CaseParam param = new CaseParam();
         param.setCaseId(caseId);
+        param.setIsMesh(isMesh);
         return ResultData.ok(caseService.sceneList(param));
     }
 

+ 2 - 0
src/main/java/com/fdkankan/fusion/request/CaseParam.java

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

+ 4 - 0
src/main/java/com/fdkankan/fusion/service/impl/CaseServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.common.util.NumTypeUtils;
 import com.fdkankan.fusion.entity.*;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.common.PageInfo;
@@ -134,6 +135,9 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
             if(numList ==null || numList.size() <=0 || type ==3){
                 continue;
             }
+            if(param.getIsMesh()!=null && param.getIsMesh() == 1 && NumTypeUtils.isLaser(type)){
+                continue;
+            }
             ScenePram scenePram = new ScenePram();
             scenePram.setType(type);
             scenePram.setPageNum(1);