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/RealTimeDataVo.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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
old mode 100644
new mode 100755
index 2ad8865..18aece4
--- 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
@@ -1,5 +1,6 @@
package org.jeecg.modules.dry.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
@@ -8,10 +9,13 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
@Data
@ToString
public class RealTimeDataVo {
+
+ private static final long serialVersionUID = 1L;
/**宸ュ崟ID*/
private String orderId;
@@ -84,13 +88,13 @@
/**鏁呴殰**/
- private String fault;
+ private String eqp_fault;
private Integer ai_total_time;
private Integer ai_time;
- private List<DryEquipment> eqpCodes;
+ // private List<DryEquipment> eqpCodes;
/**鎺ョ鐘舵�� 0锛氳嚜鍔� 1锛氭墜鍔� */
@@ -111,6 +115,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; // 鎻愪氦鏍囧織
@@ -120,6 +140,7 @@
private String report_head_num ; //鏁伴噺--16妗�/355.8Kg
private String report_head_machine ; //璁惧
private String report_head_accepter; //鎺ユ枡浜�
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
private Date report_head_date ; //鐢熶骇鏃ユ湡
private String report_head_leader ; //鐝粍闀�
private String report_head_techer ; //宸ヨ壓鍛�
@@ -155,6 +176,7 @@
private Boolean report_clean_door ; //闂ㄧ獥娓呯悊
private Boolean report_clean_box ; //绠变綋娓呯悊
private Boolean report_clean_record ; //鐢熶骇璁板綍娓呯悊
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
private Date report_clean_date ; //娓呭満鏃ユ湡
private String report_clean_man ; //娓呭満浜�
private Boolean report_clean_confirm ; //娓呭満纭
--
Gitblit v1.9.3