From 4cb4e41df7c2cc7954e09ef3751ecb24de7c06d2 Mon Sep 17 00:00:00 2001 From: hdy <1105738590@qq.com> Date: 星期五, 14 三月 2025 13:28:25 +0800 Subject: [PATCH] 修改 --- billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java | 43 ++++++++++++++++++++++++++----------------- 1 files changed, 26 insertions(+), 17 deletions(-) diff --git a/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java b/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java index 3b88c1b..3a331cf 100644 --- a/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java +++ b/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java @@ -1,14 +1,10 @@ package com.billion.main.da.domain; -import java.util.Date; - -import com.baomidou.mybatisplus.annotation.TableField; +import com.billion.common.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.billion.common.annotation.Excel; -import com.billion.main.common.BaseEntity; + +import java.util.Date; /** * 鍙傛暟閲囬泦瀵硅薄 da_param_collection @@ -17,7 +13,7 @@ * @date 2024-11-20 */ @Data -public class DaParamCollection extends BaseEntity +public class DaParamCollection { private static final long serialVersionUID = 1L; @@ -28,29 +24,42 @@ @Excel(name = "鎬绘垚搴忓垪鍙�") private String sfcCode; - /** 宸ヤ綅缂栫爜 */ - @Excel(name = "宸ヤ綅缂栫爜") + /** 宸ヤ綅缂栧彿 */ + @Excel(name = "宸ヤ綅缂栧彿") private String locationCode; + /** 鍙傛暟缂栫爜 */ @Excel(name = "鍙傛暟缂栫爜") private String paramCode; - /** 鍙傛暟鍚嶇О */ - @Excel(name = "鍙傛暟鍚嶇О") - private String paramName; - /** 鍙傛暟鍊� */ @Excel(name = "鍙傛暟鍊�") private String paramValue; - /** 閲囬泦鏃堕棿 */ + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date collectTime; - @TableField(exist = false) - private String[] timeQuery; + /** 閲囬泦鏃堕棿 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date startTime; + + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date stopTime; + + + /** 鍙傛暟鍚嶇О */ + @Excel(name = "鍙傛暟鍚嶇О") + private String paramName; + + + } -- Gitblit v1.9.3