From 9af47b4c0c25c5c2159ac6ceefced88dec72a2f9 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 25 十月 2024 16:58:18 +0800
Subject: [PATCH] Merge branch 'master' into herb-new
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java
index 2ad8865..9bc8ea9 100644
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java
@@ -8,6 +8,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
@Data
@ToString
@@ -84,7 +85,7 @@
/**鏁呴殰**/
- private String fault;
+ private String eqp_fault;
private Integer ai_total_time;
@@ -111,6 +112,22 @@
/**宸ュ崟鐘舵��*/
private Integer workorder_status;
+ /**鍚勯儴浣嶇姸鎬�**/
+ private Map<String, Object> eqp_state;
+
+ /**璁惧鐘舵��**/
+ private String eqp_status;
+
+
+ /**璁惧鎶ヨ**/
+ private String eqp_warning;
+
+
+ private String level;
+
+ /**璁惧鏁呴殰**/
+ // private String fault;
+
/**---------------------鐢熶骇璁板綍鐩稿叧瀛楁瀹氫箟---s-------------------------*/
private Boolean report_flag; // 鎻愪氦鏍囧織
--
Gitblit v1.9.3