From b651cbfd94d8d636c01b61e483ed1cff98e1bcb9 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 十二月 2024 16:13:56 +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 | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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 840fc0f..55a1c57 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;
@@ -46,9 +47,6 @@
@DictFormat("data_type")
private String dataTypeName;
-
- @Schema(description = "值类型", required = true)
- private String valueType;
@Schema(description = "存储类型", required = true)
private String storeType;
@@ -101,8 +99,23 @@
@Schema(description = "测点Tag", required = true)
private String tagNo;
+ @Schema(description = "平滑尺度")
+ private Integer dimension;
+
+ @Schema(description = "值类型")
+ private String valueType;
+
@Schema(description = "计算公式", required = true)
private String expression;
+
+ @Schema(description = "瞬时测点")
+ private String momentPoint;
+
+ @Schema(description = "累计长度")
+ private Integer length;
+
+ @Schema(description = "除数")
+ private Integer divisor;
@Schema(description = "数据源选项")
private List<String> sourceOption;
@@ -112,4 +125,18 @@
@Schema(description = "测量点")
private DaMeasurePointDTO measurePoint;
+
+ @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