From 08c7fcce9fa2a876412fa81a19550b77996214e2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 29 May 2023 20:18:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java | 55 ++++++++++++++++++++-----------------------------------
1 files changed, 20 insertions(+), 35 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java
index 5cc7ebe..92c1ad6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java
@@ -14,67 +14,52 @@
public class AlarmRecord extends BaseEntity {
/**
- * 告警分类
+ * 区域名称
*/
- private String type;
+ private String areaName;
/**
- * 告警规则类型
+ * 测站名称
*/
- private String alarmRuleType;
+ private String alarmSurveyStationName;
/**
- * 生成告警类型
+ * 测站类型
*/
- private String createAlarmType;
+ private String surveyStationType;
/**
- * 校验规则名称
+ * 处置状态
*/
- private String ruleName;
+ private String disposeStatus;
/**
- * 校验规则描述
+ * 告警条件
*/
- private String ruleRemark;
+ private String alarmCondition;
/**
- * 指标
+ * 告警规则ID
*/
- private String target;
+ private String alarmRuleId;
/**
- * 阀值
+ * 水库编号
*/
- private String threshold;
+ private String reservoirNumber;
/**
- * 告警级别
+ * 水库名称
*/
- private String alarmLevel;
+ private String reservoirName;
/**
- * 告警方式
+ * 告警测站编号
*/
- private String alarmMode;
+ private String alarmSurveyStationCode;
/**
- * 告警频次
+ * 测站新旧
*/
- private String alarmFrequency;
-
- /**
- * 告警人
- */
- private String alarmPerson;
-
- /**
- * 告警内容
- */
- private String alarmContent;
-
- /**
- * 备注
- */
- private String alarmRemark;
+ private String alarmSurveyStationNewOld;
}
--
Gitblit v1.9.3