列表添加过滤条件caseId

src/main/java/com/fdkankan/fusion/common/util/UploadToOssUtil.java

@@ -102,7 +102,7 @@ public class UploadToOssUtil {
 			ObjectMetadata metadata = new ObjectMetadata();
 			ossClient.putObject(bucket, key1, new File(filePath), metadata);
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.info("upload-to-oss:error:file-path:{},key:{}",filePath,key1);
 		} finally {
 			ossClient.shutdown();
 		}

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

@@ -10,4 +10,5 @@ public class ModelPram extends RequestBase {
     private String modelTitle;
     private Integer status;
     private Integer modelId;
+    private Integer caseId;
 }

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

@@ -56,9 +56,6 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
     ICaseTagService caseTagService;
     @Autowired
     ICaseTagPointService caseTagPointService;
-    @Resource
-    FdKKClient fdKKClient;
-
 
     @Override
     public List<CaseNumEntity> getByCaseId(Integer caseId) {

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

@@ -277,6 +277,11 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         if(deptIds.size() <=0){
             return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
         }
+        if(param.getCaseId() !=null){
+            CaseEntity caseEntity = caseService.getById(param.getCaseId());
+            String deptId = caseEntity.getDeptId();
+            wrapper.eq(Model::getDeptId,deptId);
+        }
         wrapper.in(Model::getDeptId,deptIds);
         wrapper.eq(Model::getType,3);
         wrapper.notIn(Model::getCreateStatus,-2);
@@ -304,6 +309,15 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         return PageInfo.PageInfo(page);
     }
 
+    private List<Model> getByDeptIds(List<String> asList) {
+        if(asList.size() >0){
+            LambdaQueryWrapper<Model> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(Model::getDeptId,asList);
+            return list(wrapper);
+        }
+        return new ArrayList<>();
+    }
+
     @Override
     public void delete(Integer modelId) {
         List<CaseNumEntity> caseNumEntityList = caseNumService.getByNum(modelId.toString());

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.fusion.common.ResultCode;
+import com.fdkankan.fusion.entity.CaseEntity;
 import com.fdkankan.fusion.entity.Model;
 import com.fdkankan.fusion.entity.TmCamera;
 import com.fdkankan.fusion.entity.TmDepartment;
@@ -20,10 +21,7 @@ import com.fdkankan.fusion.httpClient.response.FdkkScenePlusVo;
 import com.fdkankan.fusion.request.ScenePram;
 import com.fdkankan.fusion.response.SceneProEntityVo;
 import com.fdkankan.fusion.response.SceneVo;
-import com.fdkankan.fusion.service.IModelService;
-import com.fdkankan.fusion.service.ISceneService;
-import com.fdkankan.fusion.service.ITmCameraService;
-import com.fdkankan.fusion.service.ITmDepartmentService;
+import com.fdkankan.fusion.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +47,8 @@ public class SceneService implements ISceneService {
     ITmDepartmentService tmDepartmentService;
     @Autowired
     ITmCameraService tmCameraService;
+    @Autowired
+    ICaseService caseService;
 
     @Override
     public List<SceneVo> getSceneListAndModel(ScenePram param) {
@@ -108,6 +108,20 @@ public class SceneService implements ISceneService {
             }
             param.setSnCodes(snCodes);
         }
+        if(param.getCaseId() !=null){
+            CaseEntity caseEntity = caseService.getById(param.getCaseId());
+            String deptId = caseEntity.getDeptId();
+            List<TmCamera> tmCameras = tmCameraService.getByDeptIds(Arrays.asList(deptId));
+            List<String> snCodes = param.getSnCodes();
+            List<String> snCodes1 = tmCameras.stream().map(TmCamera::getCameraSn).collect(Collectors.toList());
+            snCodes1.add(param.getSnCode());
+            if(snCodes == null){
+                snCodes = snCodes1;
+            }else {
+                snCodes = snCodes.stream().filter(snCodes1::contains).collect(Collectors.toList());
+            }
+            param.setSnCodes(snCodes);
+        }
         if(CollectionUtil.isEmpty(param.getSnCodes()) && CollectionUtil.isEmpty(param.getNumList())){
             param.setSnCodes( Arrays.asList("no_snCode"));
         }