From 4a5d67b1e01c4ee6582b2bb43a06ede8f09e9311 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 08 十一月 2024 09:40:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/vo/PointImportExcelVO.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 ee99bb8..7cf3b6d 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,6 +1,9 @@
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.annotations.ExcelColumnSelect;
+import com.iailab.framework.excel.core.convert.DictConvert;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -26,10 +29,14 @@
@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("存储类型")
@@ -57,7 +64,9 @@
@ExcelProperty("备注")
private String remark;
- @ExcelProperty("数据源类型")
+ @ExcelProperty(value = "数据源类型", converter = DictConvert.class)
+ @ExcelColumnSelect(dictType = "data_source_type")
+ @DictFormat("data_source_type")
private String sourceType;
@ExcelProperty("数据源名称")
@@ -69,7 +78,9 @@
@ExcelProperty("平滑尺度")
private Integer dimension;
- @ExcelProperty("值类型")
+ @ExcelProperty(value = "值类型", converter = DictConvert.class)
+ @ExcelColumnSelect(dictType = "measure_value_type")
+ @DictFormat("measure_value_type")
private String valueType;
@ExcelProperty("计算公式")
--
Gitblit v1.9.3