Merge remote-tracking branch 'origin/dev' into dev

aijinhui

2024-03-26 493caef7413992d0215b9c2e2bcedd30471d89e7

 ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java

@@ -90,7 +90,8 @@
     */
    public ArdCameras checkCameraIpAndPortUnique(@Param("ip") String ip, @Param("port")Integer port);

    public List<Map<String, Object>> getCamerasByDeptId(@Param("deptId")Long deptId,@Param("userId")String userId);
    //public List<Map<String, Object>> getCamerasByDeptId(@Param("deptId")Long deptId,@Param("userId")String userId);
    public List<Map<String, Object>> getCamerasByDeptId(@Param("deptIdList")List<Long> deptIdList,@Param("userId")String userId);

    public Boolean getCameraOperationByCameraId(@Param("id") String id, @Param("userId") String userId);