Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentRunningSectionService.java

@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.dto.MdcEquipmentRunningSectionDto;
import org.jeecg.modules.mdc.entity.MdcEquipmentRunningSection;
import org.jeecg.modules.mdc.vo.DayUtilizationRateContrastQueryVo;
import org.jeecg.modules.mdc.vo.MdcAlarmAnalyzeQueryVo;
import org.jeecg.modules.mdc.vo.MdcEquipmentRunningSectionVo;

import java.util.Date;
@@ -66,5 +66,15 @@
    /**
     * 查询报警数据
     */
    List<MdcEquipmentRunningSection> findAlarmList(DayUtilizationRateContrastQueryVo vo);
    List<MdcEquipmentRunningSection> findAlarmList(MdcAlarmAnalyzeQueryVo vo);

    /**
     * 查询次数
     */
    Integer findAlarmCount(String equipmentId, String startDate, String endDate, String alarmCode);

    /**
     * 根据日期查询次数
     */
    Integer findAlarmCountByDate(String startDate, String endDate, MdcAlarmAnalyzeQueryVo vo);
}