1

src/main/java/com/fdkankan/agent/controller/CameraController.java

@@ -57,14 +57,6 @@ public class CameraController extends BaseController {
     @PostMapping("/list")
     public ResultData list(@RequestBody CameraParam param){
         param.setAgentId(getAgent().getId());
-        if(getAgent().getParentId() != null) {
-            List<Long> cameraIds = agentNewCameraService.getBySubAgent(getAgent().getId());
-            if(cameraIds.isEmpty()){
-                return ResultData.ok(PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize())));
-            }
-            param.setAuthCameraIds(cameraIds);
-        }
-
         return ResultData.ok(cameraService.pageList(param));
     }
 

src/main/java/com/fdkankan/agent/service/impl/CameraServiceImpl.java

@@ -38,16 +38,28 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     IAgentNewService agentNewService;
     @Autowired
     IAgentNewCameraService agentNewCameraService;
+    @Autowired
+    ICameraDetailService cameraDetailService;
 
     @Override
     public Object pageList(CameraParam param) {
-        if(param.getAuthCameraIds() != null && param.getAuthCameraIds().isEmpty()){
-            return PageInfo.PageInfo(new Page(param.getPageNum(),param.getPageSize()));
+
+        List<CameraDetail> details = cameraDetailService.getListByAgentId(param.getAgentId());
+        List<Long> cameraIds = details.stream().map(CameraDetail::getCameraId).collect(Collectors.toList());
+
+        List<Long> authCameraIds = agentNewCameraService.getBySubAgent(param.getAgentId());
+        if(!authCameraIds.isEmpty()) {
+            cameraIds.addAll(authCameraIds);
+        }
+
+        if(cameraIds.isEmpty()){
+            return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
         }
+        param.setCameraIds(cameraIds);
 
         Page<CameraDetailVo> voPage = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
-        List<Long> cameraIds = voPage.getRecords().stream().map(CameraDetailVo::getId).collect(Collectors.toList());
-        HashMap<Long, UserIncrement> userIncrementHashMap = userIncrementService.getByCameraIds(cameraIds);
+        List<Long> cameraId1s = voPage.getRecords().stream().map(CameraDetailVo::getId).collect(Collectors.toList());
+        HashMap<Long, UserIncrement> userIncrementHashMap = userIncrementService.getByCameraIds(cameraId1s);
 
         Set<Integer> incrementTypeIds = userIncrementHashMap.values().stream().map(UserIncrement::getIncrementTypeId).collect(Collectors.toSet());
         HashMap<Integer, IncrementType> typeMap = incrementTypeService.getMapByIds(incrementTypeIds);

src/main/java/com/fdkankan/agent/service/impl/SceneProServiceImpl.java

@@ -104,6 +104,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
         }
         param.setCameraIds(cameraIds);
+
         Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         List<SceneVo> records = page.getRecords();
         HashMap<String,SceneCopyLog> map = null;

src/main/resources/mapper/agent/CameraMapper.xml

@@ -38,15 +38,12 @@
             and ui.increment_type_id = #{param.incrementTypeId}
         </if>
 
-        <if test="param.agentId != null and ( param.authCameraIds == null or param.authCameraIds.size &lt; 0 )">
-            and d.agent_id = #{param.agentId}
-        </if>
-        <if test="param.authCameraIds != null and param.authCameraIds.size >0">
-            and (d.agent_id = #{param.agentId} or d.camera_id in
-            <foreach collection="param.authCameraIds"  item="cameraIds" open="(" separator="," close=")">
+        <if test="param.cameraIds != null and param.cameraIds.size >0">
+            and  d.camera_id in
+            <foreach collection="param.cameraIds"  item="cameraIds" open="(" separator="," close=")">
                 #{cameraIds}
             </foreach>
-            )
+
         </if>
 
         order by d.out_time desc,d.id desc