From 0cbbe2c1cbfbf73e02e1796d921c2911c96d370b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 十二月 2024 11:46:31 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/vo/PointImportExcelVO.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 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..902d3f7 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
@@ -2,8 +2,8 @@
import com.alibaba.excel.annotation.ExcelProperty;
import com.iailab.framework.excel.core.annotations.DictFormat;
+import com.iailab.framework.excel.core.annotations.ExcelColumnSelect;
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,17 +23,21 @@
@Accessors(chain = false) // 设置 chain = false，避免用户导入有问题
public class PointImportExcelVO {
+ @ExcelProperty("测点编码")
+ private String pointNo;
+
@ExcelProperty("测点名称")
private String pointName;
- @ExcelProperty("测点类型")
+ @ExcelProperty(value = "测点类型", converter = DictConvert.class)
+ @ExcelColumnSelect(dictType = "data_point_type")
+ @DictFormat("data_point_type")
private String pointType;
- @ExcelProperty("数据类型")
+ @ExcelProperty(value = "数据类型", converter = DictConvert.class)
+ @ExcelColumnSelect(dictType = "point_data_type")
+ @DictFormat("point_data_type")
private String dataType;
-
- @ExcelProperty("值类型")
- private String valueType;
@ExcelProperty("存储类型")
private String storeType;
@@ -56,16 +60,39 @@
@ExcelProperty("采集频率")
private String minfreqid;
+ @Schema(description = "备注")
@ExcelProperty("备注")
private String remark;
- @ExcelProperty("数据源类型")
+ @ExcelProperty(value = "数据源类型", converter = DictConvert.class)
+ @ExcelColumnSelect(dictType = "data_source_type")
+ @DictFormat("data_source_type")
private String sourceType;
- @ExcelProperty("数据源ID")
- private String sourceId;
+ @ExcelProperty("数据源名称")
+ private String sourceName;
@ExcelProperty("测点Tag")
private String tagNo;
+ @ExcelProperty("平滑尺度")
+ private Integer dimension;
+
+ @ExcelProperty(value = "值类型", converter = DictConvert.class)
+ @ExcelColumnSelect(dictType = "measure_value_type")
+ @DictFormat("measure_value_type")
+ private String valueType;
+
+ @ExcelProperty("计算公式")
+ private String expression;
+
+ @ExcelProperty("瞬时测点")
+ private String momentPoint;
+
+ @ExcelProperty("累计长度")
+ private Integer length;
+
+ @ExcelProperty("除数")
+ private Integer divisor;
+
}
--
Gitblit v1.9.3