From 8870ea2ebf66b589c83f1d515faeec9bc4c6431e Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期一, 28 七月 2025 14:01:51 +0800
Subject: [PATCH] 实时故障添加租户、设备区分

---
 jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryFaultRecordVo.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryFaultRecordVo.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryFaultRecordVo.java
index 8e54c18..c82fea9 100644
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryFaultRecordVo.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryFaultRecordVo.java
@@ -13,20 +13,28 @@
 @Data
 public class DryFaultRecordVo extends DryFaultRecord implements Serializable {
     private static final long serialVersionUID = 1L;
-    //redis鏁呴殰缁撴潫鎶�鏈�
+    //redis鏁呴殰缁撴潫璁版暟
     private Integer eCount;
     //璁惧鍚嶇О
     private String equName;
+    //璁惧缂栫爜
+    private String equCode;
     //绉熸埛鍚嶇О
     private String tenantName;
+    //鏁呴殰鏃堕棿
+    private String faultTimeStr;
 
     public DryFaultRecordVo() {
     }
-
-    public DryFaultRecordVo(String orderId, Integer tenantId, String faultName, Integer faultType, Date startTime, Date endTime, Integer eCount, String equName, String tenantName) {
+    public DryFaultRecordVo(DryFaultRecord record, Integer count) {
+        super(record.getOrderId(),record.getTenantId(),record.getFaultName(),record.getFaultType(),record.getStartTime(),record.getEndTime());
+        this.eCount = count;
+    }
+    public DryFaultRecordVo(String orderId, Integer tenantId, String faultName, Integer faultType, Date startTime, Date endTime, Integer eCount,String equCode, String equName, String tenantName) {
         super(orderId, tenantId, faultName, faultType, startTime, endTime);
         this.eCount = eCount;
         this.equName = equName;
+        this.equCode = equCode;
         this.tenantName = tenantName;
     }
 }

--
Gitblit v1.9.3