Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-07 8c8af4faa4303499fe9e81dd117932e246008eb0

 ard-work/src/main/java/com/ruoyi/alarm/camera/mapper/ArdAlarmCameraMapper.java

@@ -2,6 +2,8 @@

import java.util.List;
import com.ruoyi.alarm.camera.domain.ArdAlarmCamera;
import com.ruoyi.statistical.param.ESParam;
import com.ruoyi.statistical.vo.CountVo;
import org.apache.ibatis.annotations.Param;


@@ -66,4 +68,7 @@
    int selectCountByAlarmTime(@Param("refreshTime")String refreshTime);

    int updateViewTimeByCameraName(@Param("cameraName")String cameraName,@Param("alarmTime") String alarmTime,@Param("viewTime") String viewTime);

    //根据月份统计数量
    List<CountVo> cameraYear(ESParam esParam);
}