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 | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 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 ffdf34c..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,16 +1,21 @@ 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; import lombok.ToString; import org.jeecg.modules.dry.entity.DryEquipment; +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; @@ -83,32 +88,30 @@ /**鏁呴殰**/ - private String fault; + private String eqp_fault; private Integer ai_total_time; 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 String eqp_status; + + + /**璁惧鎶ヨ**/ + private String eqp_warning; + + + private String level; + + + } -- Gitblit v1.9.3