From e8ad669f7c97d45cd23630dc101180a130d6c17e Mon Sep 17 00:00:00 2001 From: dongyukun <1208714201@qq.com> Date: 星期二, 05 十一月 2024 10:04:57 +0800 Subject: [PATCH] tag当前值开发 --- iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/vo/PointImportExcelVO.java | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/vo/PointImportExcelVO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/vo/PointImportExcelVO.java index c8fe449..ee99bb8 100644 --- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/vo/PointImportExcelVO.java +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/vo/PointImportExcelVO.java @@ -1,9 +1,6 @@ package com.iailab.module.data.point.vo; import com.alibaba.excel.annotation.ExcelProperty; -import com.iailab.framework.excel.core.annotations.DictFormat; -import com.iailab.framework.excel.core.convert.DictConvert; -import com.iailab.module.system.enums.DictTypeConstants; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; @@ -23,6 +20,9 @@ @Accessors(chain = false) // 设置 chain = false,避免用户导入有问题 public class PointImportExcelVO { + @ExcelProperty("测点编码") + private String pointNo; + @ExcelProperty("测点名称") private String pointName; @@ -31,9 +31,6 @@ @ExcelProperty("数据类型") private String dataType; - - @ExcelProperty("值类型") - private String valueType; @ExcelProperty("存储类型") private String storeType; @@ -56,16 +53,26 @@ @ExcelProperty("采集频率") private String minfreqid; + @Schema(description = "备注") @ExcelProperty("备注") private String remark; @ExcelProperty("数据源类型") private String sourceType; - @ExcelProperty("数据源ID") - private String sourceId; + @ExcelProperty("数据源名称") + private String sourceName; @ExcelProperty("测点Tag") private String tagNo; + @ExcelProperty("平滑尺度") + private Integer dimension; + + @ExcelProperty("值类型") + private String valueType; + + @ExcelProperty("计算公式") + private String expression; + } -- Gitblit v1.9.3