From 997c1d0eb7c694b6c30eee66427671b818a44a8f Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期三, 07 五月 2025 17:58:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dto/DaPointDTO.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dto/DaPointDTO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dto/DaPointDTO.java
index fca527d..ff49fd3 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dto/DaPointDTO.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dto/DaPointDTO.java
@@ -1,5 +1,6 @@
package com.iailab.module.data.point.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.iailab.framework.common.validation.group.AddGroup;
import com.iailab.framework.common.validation.group.UpdateGroup;
import com.iailab.framework.excel.core.annotations.DictFormat;
@@ -107,6 +108,21 @@
@Schema(description = "计算公式", required = true)
private String expression;
+ @Schema(description = "瞬时测点")
+ private String momentPoint;
+
+ @Schema(description = "累计长度")
+ private Integer length;
+
+ @Schema(description = "累计单位")
+ private String cumulateUnit;
+
+ @Schema(description = "除数")
+ private Integer divisor;
+
+ @Schema(description = "是否累计负数")
+ private Integer isCumuNeg;
+
@Schema(description = "数据源选项")
private List<String> sourceOption;
@@ -118,4 +134,15 @@
@Schema(description = "累计点")
private DaCumulatePointDTO cumulatePoint;
+
+ @Schema(description = "采集值")
+ private String collectValue;
+
+ @Schema(description = "采集质量")
+ private String collectQuality;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Schema(description = "采集时间")
+ private Date collectTime;
+
}
\ No newline at end of file
--
Gitblit v1.9.3