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/DryFaultRecordVo.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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..b74fdf1 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,16 +13,21 @@
@Data
public class DryFaultRecordVo extends DryFaultRecord implements Serializable {
private static final long serialVersionUID = 1L;
- //redis鏁呴殰缁撴潫鎶�鏈�
+ //redis鏁呴殰缁撴潫璁版暟
private Integer eCount;
//璁惧鍚嶇О
private String equName;
//绉熸埛鍚嶇О
private String tenantName;
+ //鏁呴殰鏃堕棿
+ private String faultTimeStr;
public DryFaultRecordVo() {
}
-
+ 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 equName, String tenantName) {
super(orderId, tenantId, faultName, faultType, startTime, endTime);
this.eCount = eCount;
--
Gitblit v1.9.3