From b4b962e1ca05abd8bfc63c80f1adc3df5cfa1a24 Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期一, 26 六月 2023 13:00:06 +0800
Subject: [PATCH] 增加电能和蒸汽消耗，完善工单机器状态
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 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
index 34e0def..c8b96a1 100644
--- 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
@@ -71,6 +71,9 @@
/**棰勮鍓╀綑鏃堕棿*/
@ApiModelProperty(value = "棰勮鍓╀綑鏃堕棿")
private Integer remain;
+ /**褰撳墠闃舵棰勮鍓╀綑鏃堕棿*/
+ @ApiModelProperty(value = "褰撳墠闃舵棰勮鍓╀綑鏃堕棿")
+ private Integer curRemain;
/**璁惧*/
@ApiModelProperty(value = "璁惧", example = "S1001")
private String equId;
@@ -84,15 +87,17 @@
@ApiModelProperty(value = "绉熸埛id", example = "1000")
private Integer tenantId;
/**宸ュ崟鐘舵��
- * 涓婃枡
- * 缈绘枡
- * 骞茬嚗
- * 绉伴噸
- * 鍑烘枡
- *
+ * 0: 鍑嗗
+ * 1: 涓婃枡
+ * 2: 鐢熶骇
+ * fan1: 骞茬嚗
+ * roller4: 缈绘枡
+ * roller5: 鍑烘枡
+ * 3: 鏆傚仠
+ * 4: 瀹屾垚
* */
@ApiModelProperty(value = "宸ュ崟鐘舵��")
- private String orderStatus;
+ private Integer orderStatus;
/**鎿嶄綔浜�*/
@ApiModelProperty(value = "鎿嶄綔浜�")
@@ -105,7 +110,7 @@
/**鐢佃兘娑堣��*/
@ApiModelProperty(value = "鐢佃兘娑堣��")
- private Double electric;
+ private Double watt;
/**鏁呴殰*/
@ApiModelProperty(value = "鏁呴殰")
private String fault;
@@ -130,6 +135,30 @@
/**鐑 true/鍐烽 false*/
private Boolean wind;
+ /**瀵规瘮鏈哄彴鍙�*/
+ private List<String> compEqpNum;
+
+ /**瀵规瘮鏈哄彴鏁堢巼*/
+ private List<Double> compEqpEffic;
+
+
+ /**鎺ョ鐘舵�� 0锛氳嚜鍔� 1锛氭墜鍔� */
+ private Integer state_auto;
+
+ /**椋庣鐘舵�� 0锛氫綆浣嶉潤姝� 1锛氶珮浣嶉潤姝� 2锛氭鍦ㄤ笂鍗� 3锛氭鍦ㄤ笅闄�*/
+ private Integer state_windbox;
+
+ /**婊氱瓛鐘舵�� 0锛氶珮浣嶉潤姝� 1锛氫綆浣嶉潤姝� 2锛氭鍦ㄤ笂鍗� 3锛氭鍦ㄤ笅闄� 4锛氭杞� 5锛氬弽杞�*/
+ private Integer state_roller;
+
+ /**椋庢満鐘舵�� 0锛氬叧闂� 1锛氬紑鍚�*/
+ private Integer state_fan;
+
+ /**钂告苯闃�鐘舵�� 0锛氬叧闂� 1锛氬紑鍚�*/
+ private Integer state_valve;
+
+
+
public DryOrderVo(RealTimeDataVo realTimeDataVo) {
this.id = IdUtil.fastSimpleUUID();
this.code = realTimeDataVo.getWorkorder();
@@ -153,6 +182,11 @@
this.tenantId = realTimeDataVo.getTenantid();
this.orderTime = new Date();
this.yield = realTimeDataVo.getWeight3();
-
+ this.watt = realTimeDataVo.getWatt();
+ this.steam = realTimeDataVo.getSteam();
+ this.envHum = realTimeDataVo.getEnvhum();
+ this.envTemp = realTimeDataVo.getEnvtemp();
+ this.remain = realTimeDataVo.getAi_total_time();
+ this.orderStatus = realTimeDataVo.getWorkorder_status();
}
}
--
Gitblit v1.9.3