From 7572552bcebd353050f95a1965526e2fadb31f67 Mon Sep 17 00:00:00 2001 From: zhongrj <646384940@qq.com> Date: Tue, 08 Aug 2023 16:56:31 +0800 Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev --- skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/AlarmGet.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/AlarmGet.java b/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/AlarmGet.java index 1c4dfb9..d9ce7f2 100644 --- a/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/AlarmGet.java +++ b/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/AlarmGet.java @@ -38,8 +38,9 @@ private String pointId; /** - * 物理量id + * 物理量id type,1：渗压，2：渗流，3：X位移，4：Y位移，5：Z位移 */ + private String type; /** @@ -93,17 +94,22 @@ * 正向阈值 */ @TableField(value = "forward",typeHandler = FastjsonTypeHandler.class) - private Object forward; + private String forward; /** * 反向阈值 */ @TableField(value = "\"REVERSE\"",typeHandler = FastjsonTypeHandler.class) - private Object reverse; + private String reverse; /** * 系数阈值 */ @TableField(value = "ratio",typeHandler = FastjsonTypeHandler.class) - private Object ratio; + private String ratio; + + /** + * 处置状态(1、已处置；2、未处置) + */ + private String status; } -- Gitblit v1.9.3