From b7ccb76e7a40ca745ea83575ed2076cd38a06460 Mon Sep 17 00:00:00 2001
From: zhanghan11 <zhanghan11@inspur.com>
Date: Mon, 30 Sep 2024 15:00:59 +0800
Subject: [PATCH] =?UTF-8?q?plc=E8=A7=84=E5=88=99=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/inspur/ipc/utils/IpcConstant.java       | 4 ++--
 .../main/resources/mapper/ipc/IpcAlarmRulesConfigMapper.xml   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tzipc-server/tzipc-system/src/main/java/com/inspur/ipc/utils/IpcConstant.java b/tzipc-server/tzipc-system/src/main/java/com/inspur/ipc/utils/IpcConstant.java
index e531ec9..7ec77db 100644
--- a/tzipc-server/tzipc-system/src/main/java/com/inspur/ipc/utils/IpcConstant.java
+++ b/tzipc-server/tzipc-system/src/main/java/com/inspur/ipc/utils/IpcConstant.java
@@ -102,12 +102,12 @@ public class IpcConstant {
     /**
      * 规则类型-试运行
      */
-    public static final String RULE_TYPE_TRIAL_RUN = "trial_run";
+    public static final String RULE_TYPE_TRIAL_RUN = "1";
 
     /**
      * 规则类型-运行中
      */
-    public static final String RULE_TYPE_IN_RUNNING = "in_running";
+    public static final String RULE_TYPE_IN_RUNNING = "0";
 
     /**
      * 大屏滚动展示报警条数
diff --git a/tzipc-server/tzipc-system/src/main/resources/mapper/ipc/IpcAlarmRulesConfigMapper.xml b/tzipc-server/tzipc-system/src/main/resources/mapper/ipc/IpcAlarmRulesConfigMapper.xml
index 7875c12..7b343b5 100644
--- a/tzipc-server/tzipc-system/src/main/resources/mapper/ipc/IpcAlarmRulesConfigMapper.xml
+++ b/tzipc-server/tzipc-system/src/main/resources/mapper/ipc/IpcAlarmRulesConfigMapper.xml
@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="alarmLevel" column="alarm_level"/>
         <result property="sort" column="sort"/>
         <result property="equipName" column="equip_name"/>
+        <result property="deptId" column="dept_id"/>
         <result property="deptName" column="dept_name"/>
     </resultMap>