From 0a2b23ad3f30dfb01c5d590fb98f39e93bfe1932 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 31 十二月 2024 18:35:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/vo/HttpTagRespVO.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/vo/HttpTagRespVO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/vo/HttpTagRespVO.java
index 8ca9e9f..1891995 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/vo/HttpTagRespVO.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/vo/HttpTagRespVO.java
@@ -2,6 +2,7 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -39,11 +40,20 @@
@Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@ExcelProperty("是否启用")
- private Boolean enabled;
+ private Integer enabled;
@Schema(description = "数据值", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@ExcelProperty("数据值")
- private Double dataValue;
+ private Object dataValue;
+
+ @Schema(description = "数据质量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @ExcelProperty("数据质量")
+ private String dataQuality;
+
+ @Schema(description = "数据时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @ExcelProperty("数据时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date dataTime;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@ExcelProperty("创建时间")
--
Gitblit v1.9.3