diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwDictConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwDictConstants.java
index 3d673e8..3c68d1c 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwDictConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwDictConstants.java
@@ -176,4 +176,7 @@ public class HwDictConstants {
public static final String ALARM_TYPE_COMMON_FLAG_YES = "1";//报警类型通用标识:是
public static final String ALARM_TYPE_COMMON_FLAG_NO = "0";//报警类型通用标识:否
+ public static final String OFFLINE_RULE_TYPE_DEVICE = "1";//离线报警规则类型:设备
+ public static final String OFFLINE_RULE_TYPE_SCENE = "3";//离线报警规则类型:场景
+
}
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java
index 8212b25..da2e9f3 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java
@@ -70,5 +70,10 @@ public enum BusinessType
/**
* 重建表
*/
- REBUILD
+ REBUILD,
+
+ /**
+ * 分配
+ */
+ ALLOCATE
}
diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwOfflineTargetMapper.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwOfflineTargetMapper.java
index 5740b3b..09c40d5 100644
--- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwOfflineTargetMapper.java
+++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwOfflineTargetMapper.java
@@ -38,4 +38,13 @@ public interface HwOfflineTargetMapper {
*/
public int deleteOfflineTargets(@Param("offlineRuleId") Long offlineRuleId,
@Param("targetType") String targetType, @Param("targetIds") Long[] targetIds);
+
+ /**
+ * @param: offlineTarget
+ * @description 查询离线报警规则目标数量
+ * @author xins
+ * @date 2023-11-15 11:24
+ * @return Integer
+ */
+ public Integer selectOfflineTargetCount(HwOfflineTarget offlineTarget);
}
diff --git a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceMapper.xml b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceMapper.xml
index f44b020..03ada52 100644
--- a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceMapper.xml
+++ b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceMapper.xml
@@ -346,7 +346,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select distinct hd.device_id,hd.device_code,hd.device_name,hd.device_type,hd.publish_time,hmu.monitor_unit_name
from hw_device hd left join hw_monitor_unit hmu on hd.monitor_unit_id = hmu.monitor_unit_id
where hd.device_status != '9' and hd.scene_id=#{sceneId}
- and not exists (select 1 from hw_offline_target hot where hot.target_id=hd.device_id and hot.offline_rule_id = #{offlineRuleId})
+ and not exists (select 1 from hw_offline_target hot where hot.target_id=hd.device_id and hot.target_type = 1)
AND hd.device_code like concat('%', #{deviceCode}, '%')
diff --git a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwOfflineRuleMapper.xml b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwOfflineRuleMapper.xml
index 0741226..fcb25bb 100644
--- a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwOfflineRuleMapper.xml
+++ b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwOfflineRuleMapper.xml
@@ -57,7 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"