From 14533c7e1c74034f775a1d741ed578bdc46ecc4c Mon Sep 17 00:00:00 2001
From: hanyong <1334742946@qq.com>
Date: Tue, 3 Jan 2023 11:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/njcn/system/enums/DicDataEnum.java       | 3 ++-
 .../src/main/java/com/njcn/system/enums/DicDataTypeEnum.java   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
index dd24bc263..33bc827bd 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
@@ -119,7 +119,8 @@ public enum DicDataEnum {
     EVENT_TYPE_D("电压越上限严重度","Event_Type_d"),
     EVENT_TYPE_F("电压越下限严重度","Event_Type_f"),
     EVENT_TYPE_G("渗透率","Event_Type_g"),
-
+    EVENT_TYPE_Z("超标3%-10%","Event_Type_z"),
+    EVENT_TYPE_X("超标10%以下","Event_Type_x"),
     /**
      * 监测点状态
      */
diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java
index ee7e730f0..08bcbd8ac 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java
@@ -54,6 +54,7 @@ public enum DicDataTypeEnum {
     DEVICE_STATUS("设备状态","Device_Status"),
     INTERFERENCE_SOURCE("监测对象类别","Interference_Source"),
     PLAN_TAKE("计划采取实施","Plan_Take"),
+    MONITOR_OBJ("监测对象","Monitor_Obj"),
     CONNET_GROUP_WAY("牵引站变压器接线方式","Connet_Group_Way");