1

README.md

@@ -42,3 +42,11 @@
 ~~~~
 
 
+###**v1.6.0**
+~~~~
+1.场景下载功能
+2.首页统计
+3.添加多数据源配置
+4.下载记录日志记录
+5.所属架构数据过滤
+~~~~

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

@@ -88,7 +88,10 @@ public class SceneService implements ISceneService {
             }
         }
         if(StringUtils.isNotBlank(param.getDeptId())){
-            List<TmCamera> tmCameras = tmCameraService.getByDeptIds(Arrays.asList(param.getDeptId()));
+            List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(param.getDeptId());
+            List<String> deptIds = sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList());
+            deptIds.add(param.getDeptId());
+            List<TmCamera> tmCameras = tmCameraService.getByDeptIds(deptIds);
             Set<String> snCodeSet = tmCameras.parallelStream().map(TmCamera::getCameraSn).collect(Collectors.toSet());
             List<String> snCodes = param.getSnCodes();
             if(snCodes == null){

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

@@ -184,11 +184,18 @@ public class TmCameraServiceImpl extends ServiceImpl<ITmCameraMapper, TmCamera>
         if (StringUtils.isNotBlank(snCode)) {
             wrapper.like(TmCamera::getCameraSn,snCode);
         }
+        List<String> deptIds = tmDepartmentService.getDeptIds();
+        List<String> deptIds2 = new ArrayList<>();
         if(StringUtils.isNotBlank(deptId)){
-            wrapper.eq(TmCamera::getDeptId,deptId);
+            List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(deptId);
+            deptIds2 = sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList());
+            deptIds2.add(deptId);
+        }
+        if(!deptIds2.isEmpty()){
+            List<String> finalDeptIds = deptIds2;
+            List<String> collect = deptIds.stream().filter(e -> finalDeptIds.contains(e)).collect(Collectors.toList());
+            wrapper.in(TmCamera::getDeptId,collect);
         }
-        List<String> deptIds = tmDepartmentService.getDeptIds();
-        wrapper.in(TmCamera::getDeptId,deptIds);
         wrapper.orderByDesc(TmCamera::getCreateTime);
         Page<TmCamera> page = this.page(new Page<>(pageNum, pageSize), wrapper);
         if(page.getRecords().size()<=0){