From 39cae5e98a6fd6fb7ade9c80a11f45f46d0ab4c5 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 06 二月 2025 17:01:07 +0800
Subject: [PATCH] 修改实时数据接口
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java | 74 ++-----------------------------------
1 files changed, 4 insertions(+), 70 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 9bc8ea9..72046db
--- 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;
@@ -13,6 +14,8 @@
@Data
@ToString
public class RealTimeDataVo {
+
+ private static final long serialVersionUID = 1L;
/**宸ュ崟ID*/
private String orderId;
@@ -91,29 +94,12 @@
private Integer ai_time;
- private List<DryEquipment> eqpCodes;
-
-
- /**鎺ョ鐘舵�� 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;
/**宸ュ崟鐘舵��*/
private Integer workorder_status;
/**鍚勯儴浣嶇姸鎬�**/
- private Map<String, Object> eqp_state;
+// private Map<String, Object> eqp_state;
/**璁惧鐘舵��**/
private String eqp_status;
@@ -125,59 +111,7 @@
private String level;
- /**璁惧鏁呴殰**/
- // private String fault;
- /**---------------------鐢熶骇璁板綍鐩稿叧瀛楁瀹氫箟---s-------------------------*/
-
- private Boolean report_flag; // 鎻愪氦鏍囧織
-
- private String report_head_name; // 鍝佸悕
- private String report_head_batch ; //鎵规
- private String report_head_num ; //鏁伴噺--16妗�/355.8Kg
- private String report_head_machine ; //璁惧
- private String report_head_accepter; //鎺ユ枡浜�
- private Date report_head_date ; //鐢熶骇鏃ユ湡
- private String report_head_leader ; //鐝粍闀�
- private String report_head_techer ; //宸ヨ壓鍛�
- //妫�鏌�
- private Boolean report_check_field ; //鐢熶骇鐜板満
- private Boolean report_check_file ; //鎵ц鏂囦欢
- private Boolean report_check_tag ; //鐗╂枡鏍囩ず
- private Boolean report_check_tool ; //绉伴噺鍣ㄥ叿
- private String report_check_man ; //妫�鏌ヤ汉
- private Boolean report_check_status; //妫�鏌ユ儏鍐�
- private String report_check_qa ; //QA
- private String report_check_record ; //寮傚父璁板綍
- //鐢熶骇
- private Boolean report_product_view ; //澶栬妫�鏌�
- private Boolean report_product_wind ; //鍚归
- private Boolean report_product_sun ; //鏅�
- private Boolean report_product_low_dry ; //浣庢俯骞茬嚗
- private Boolean report_product_dry ; //骞茬嚗
- private String report_product_start ; //寮�濮嬫椂闂�
- private String report_product_end ; //缁撴潫鏃堕棿
- private Integer report_product_total ; //骞茬嚗鎬绘椂闂�
- private Boolean report_product_check ; //骞茬嚗妫�鏌�
- private String report_product_man1 ; //鎿嶄綔浜�
- private String report_product_man2 ; //澶嶆牳浜�
- private Double report_product_weight ; //鎿嶄綔鍚庨噸閲�
- private Double report_product_waste ; //搴熸枡鏁伴噺
- private Double report_product_use ; //鏀剁巼
- private String report_product_qa ; //QA
- //娓呭満
- private Boolean report_clean_machine ; //璁惧娓呯悊
- private Boolean report_clean_waste ; //搴熸枡娓呯悊
- private Boolean report_clean_tool ; //宸ュ叿娓呯悊
- private Boolean report_clean_door ; //闂ㄧ獥娓呯悊
- private Boolean report_clean_box ; //绠变綋娓呯悊
- private Boolean report_clean_record ; //鐢熶骇璁板綍娓呯悊
- private Date report_clean_date ; //娓呭満鏃ユ湡
- private String report_clean_man ; //娓呭満浜�
- private Boolean report_clean_confirm ; //娓呭満纭
- private String report_clean_qa ; //QA
-
- /**---------------------鐢熶骇璁板綍鐩稿叧瀛楁瀹氫箟---e-------------------------*/
}
--
Gitblit v1.9.3