告警模块提交

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/AlarmTypeMapper.java

@@ -4,7 +4,7 @@ import com.zcxk.rmcp.api.dto.alarm.AlarmTypeDto;
 import com.zcxk.rmcp.api.dto.alarm.AlarmTypePageDto;
 import com.zcxk.rmcp.core.entity.AlarmType;
 import org.apache.ibatis.annotations.Param;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
 
 import java.util.List;
 
@@ -82,6 +82,7 @@ public interface AlarmTypeMapper {
      */
     int count();
 
-    IPage<AlarmType> selectPage(IPage<AlarmType> page, AlarmType alarmType);
 
+
+    List<AlarmType> selectTypesWithRules(List<Integer> ids);
 }

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/DeviceAlarmRuleMapper.java

@@ -2,7 +2,7 @@ package com.zcxk.rmcp.core.dao;
 
 import com.zcxk.rmcp.core.entity.DeviceAlarmRule;
 import org.apache.ibatis.annotations.Param;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
 
 import java.util.List;
 import java.util.Map;
@@ -82,6 +82,5 @@ public interface DeviceAlarmRuleMapper {
      */
     int count();
 
-    IPage<DeviceAlarmRule> selectPage(IPage<DeviceAlarmRule> page, DeviceAlarmRule deviceAlarmRule);
 
 }