若依微服务1.9.9

business
1、每个场景只能配置一个离线报警规则。
2、每个设备也只能配置一个离线报警规则。

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";//离线报警规则类型：场景
+
 }

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
 }

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);
 }

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)
         <if test="deviceCode != null and deviceCode != ''">
             AND hd.device_code like concat('%', #{deviceCode}, '%')
         </if>

ruoyi-modules/hw-business/src/main/resources/mapper/business/HwOfflineRuleMapper.xml

@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectHwOfflineRuleList" parameterType="HwOfflineRule" resultMap="HwOfflineRuleResult">
         <include refid="selectHwOfflineRuleVo"/>
         <where>
+            deleted_flag = '0'
             <if test="offlineRuleName != null  and offlineRuleName != ''"> and offline_rule_name like concat('%', #{offlineRuleName}, '%')</if>
             <if test="tenantId != null "> and tenant_id = #{tenantId}</if>
             <if test="sceneId != null "> and scene_id = #{sceneId}</if>

ruoyi-modules/hw-business/src/main/resources/mapper/business/HwOfflineTargetMapper.xml

@@ -29,4 +29,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+    <select id="selectOfflineTargetCount" parameterType="HwOfflineTarget" resultType="Integer">
+        select count(1) from hw_offline_target hot
+        <where>
+            <if test="targetType != null  and targetType != ''"> and target_type = #{targetType}</if>
+            <if test="targetId != null "> and target_id = #{targetId}</if>
+        </where>
+    </select>
+
+    
 </mapper>

ruoyi-ui/src/views/business/offlineRule/index.vue

@@ -559,7 +559,7 @@ export default {
         tenantId: null,
         sceneId: null,
         alarmLevelId: null,
-        ruleType: '3',
+        ruleType: '1',
         offlineTime: undefined,
         offlineNumberTime: 1,
         offlineNumber: 1,