From 7c585586e9bea943161676bd9d127e81123891c3 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 11 十二月 2024 11:01:35 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into herb
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java
old mode 100644
new mode 100755
index c8b96a1..7ceb381
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java
@@ -115,6 +115,8 @@
@ApiModelProperty(value = "鏁呴殰")
private String fault;
+ private List<String> faultList = new ArrayList<>();
+
@ApiModelProperty(value = "鏄庣粏鏁版嵁鍒楄〃")
private List<DryOrderTrendVo> detailList = new ArrayList<>();
@ApiModelProperty(value = "鏄庣粏")
@@ -157,7 +159,31 @@
/**钂告苯闃�鐘舵�� 0锛氬叧闂� 1锛氬紑鍚�*/
private Integer state_valve;
+ /**鎶ヨ**/
+ private String warning;
+ /**鐘舵��**/
+// private Map<String, Object> eqp_state;
+
+ /**璁惧鐘舵��**/
+ private String eqp_status;
+
+ private String level;
+
+ /**
+ * 骞茬嚗鍑忓皯閲嶉噺
+ */
+ private Double reduce;
+
+
+ /**骞冲潎鏁堢巼**/
+ private Double efficAvg;
+
+ /**骞冲潎姹借��**/
+ private Double steamAvg;
+
+ /**骞冲潎鐢佃��**/
+ private Double wattAvg;
public DryOrderVo(RealTimeDataVo realTimeDataVo) {
this.id = IdUtil.fastSimpleUUID();
--
Gitblit v1.9.3