Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-20 71972694f7d5f23cf42226366a9ddaad4b72b89f

 ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java

@@ -13,6 +13,7 @@
import com.ycl.platform.domain.vo.screen.MonitorTotalVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.security.core.parameters.P;

import java.util.List;
import java.util.Map;
@@ -49,6 +50,7 @@
     * @return 设备资产集合
     */
    public List<TMonitorVO> selectMonitorVOList();

    /**
     * 新增设备资产
     *
@@ -171,5 +173,5 @@
     * @param tMonitor 设备资产
     * @return 设备资产集合
     */
    public List<TMonitorResult> selectMonitorResult(Short cameraFunType);
    public List<TMonitorResult> selectMonitorResult(@Param("cameraFunType") Short cameraFunType,@Param("deptIds") List<Integer> deptIds);
}