From 2c24f787f28e85af3a7f89e4277063e9a2523909 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 09 一月 2025 17:25:33 +0800
Subject: [PATCH] 两网融合部分

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentRunningSectionDto.java |   45 +++++++++++++++++++++++++++++++++++----------
 1 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentRunningSectionDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentRunningSectionDto.java
index 62226ab..15dc7af 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentRunningSectionDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentRunningSectionDto.java
@@ -1,6 +1,10 @@
 package org.jeecg.modules.mdc.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.jeecg.modules.mdc.util.DateUtils;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -13,20 +17,41 @@
 
     /*搴忓彿*/
     private String id;
+
+    /*鐘舵��,0:鍏虫満,1:寮�鏈�,2:寰呮満,3:宸ヤ綔,22:鎶ヨ*/
+    @Excel(name = "鐘舵��", width = 15, replace={"鍏虫満_0","寮�鏈篲1","寰呮満_2","宸ヤ綔_3","鎶ヨ_22"})
+    private Integer status;
+
+    /*寮�濮嬫椂闂�*/
+    @Excel(name = "寮�濮嬫椂闂�", width = 24, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date startTime;
+
+    /*缁撴潫鏃堕棿*/
+    @Excel(name = "缁撴潫鏃堕棿", width = 24, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    /*鎸佺画鏃堕棿*/
+    @Excel(name = "鎸佺画鏃堕棿", width = 24, exportConvert = true)
+    private Long duration;
+
+    //绋嬪簭鍙�
+    @Excel(name = "绋嬪簭鍙�", width = 20)
+    private String sequenceNumber;
+
     /*璁惧*/
     private String equipmentId;
-    /*寮�濮嬫椂闂�*/
-    private Date startTime;
-    /*缁撴潫鏃堕棿*/
-    private Date endTime;
-    /*鏃堕暱*/
-    private Long duration;
-    /*鐘舵��,0:鍏虫満,1:寮�鏈�,2:寰呮満,3:宸ヤ綔,22:鎶ヨ*/
-    private Integer status;
+
     /*鎶ヨ*/
     private String alarm;
     /*浼垪 鎶ヨ鍐呭*/
     private String alarmContent;
-    //绋嬪簭鍙�
-    private String sequenceNumber;
+
+    public String convertgetDuration(){
+        return DateUtils.secondsToTime(this.duration.intValue());
+    }
+
 }

--
Gitblit v1.9.3