From 215dbc962d7691cec2fba90f00afa2c55bec6a14 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 13 九月 2024 11:33:53 +0800
Subject: [PATCH] 数据集配置
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/vo/IndDataSetFieldSaveReqVO.java | 2 +-
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/controller/admin/IndDataSetFieldController.java | 2 +-
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/controller/admin/IndDataSetController.java | 10 ++++++++++
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/service/IndDataSetService.java | 4 ++++
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/service/impl/IndDataSetServiceImpl.java | 6 ++++++
5 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/controller/admin/IndDataSetController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/controller/admin/IndDataSetController.java
index e803787..bd83fbe 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/controller/admin/IndDataSetController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/controller/admin/IndDataSetController.java
@@ -18,6 +18,8 @@
import javax.validation.Valid;
+import java.util.List;
+
import static com.iailab.framework.common.pojo.CommonResult.success;
/**
@@ -73,4 +75,12 @@
IndDataSetEntity entity = indDataSetService.get(id);
return success(BeanUtils.toBean(entity, IndDataSetRespVO.class));
}
+
+ @GetMapping("/list-all-simple")
+ @Operation(summary = "获取指标数据集列表", description = "用于【指标数据集】界面")
+ @PreAuthorize("@ss.hasPermission('data:ind-data-set:query')")
+ public CommonResult<List<IndDataSetRespVO>> list(IndDataSetPageReqVO reqVO) {
+ List<IndDataSetEntity> list = indDataSetService.list(reqVO);
+ return success(BeanUtils.toBean(list, IndDataSetRespVO.class));
+ }
}
\ No newline at end of file
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/controller/admin/IndDataSetFieldController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/controller/admin/IndDataSetFieldController.java
index cb1897e..08d84ee 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/controller/admin/IndDataSetFieldController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/controller/admin/IndDataSetFieldController.java
@@ -67,7 +67,7 @@
@GetMapping("/get")
@Operation(summary = "获取指标数据集字段信息")
- @PreAuthorize("@ss.hasPermission('system:ind-data-set:query')")
+ @PreAuthorize("@ss.hasPermission('data:ind-data-set:query')")
public CommonResult<IndDataSetFieldRespVO> get(String id) {
IndDataSetFieldEntity entity = indDataSetFieldService.get(id);
return success(BeanUtils.toBean(entity, IndDataSetFieldRespVO.class));
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/service/IndDataSetService.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/service/IndDataSetService.java
index abcf86d..0e443bd 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/service/IndDataSetService.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/service/IndDataSetService.java
@@ -6,6 +6,8 @@
import com.iailab.module.data.ind.data.vo.IndDataSetPageReqVO;
import com.iailab.module.data.ind.data.vo.IndDataSetSaveReqVO;
+import java.util.List;
+
/**
* @author PanZhibao
* @Description
@@ -22,4 +24,6 @@
IndDataSetEntity get(String id);
void delete(String id);
+
+ List<IndDataSetEntity> list(IndDataSetPageReqVO reqVO);
}
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/service/impl/IndDataSetServiceImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/service/impl/IndDataSetServiceImpl.java
index 25f46b7..5abbbad 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/service/impl/IndDataSetServiceImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/service/impl/IndDataSetServiceImpl.java
@@ -13,6 +13,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
+import java.util.List;
import java.util.UUID;
/**
@@ -30,6 +31,11 @@
}
@Override
+ public List<IndDataSetEntity> list(IndDataSetPageReqVO reqVO) {
+ return baseDao.selectList();
+ }
+
+ @Override
public void create(IndDataSetSaveReqVO createReqVO) {
IndDataSetEntity entity = BeanUtils.toBean(createReqVO, IndDataSetEntity.class);
entity.setId(UUID.randomUUID().toString());
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/vo/IndDataSetFieldSaveReqVO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/vo/IndDataSetFieldSaveReqVO.java
index 9ca9c04..c0d203c 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/vo/IndDataSetFieldSaveReqVO.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/vo/IndDataSetFieldSaveReqVO.java
@@ -21,7 +21,7 @@
@NotNull(message = "数据集ID不能为空")
private String dataSetId;
- @Schema(description = "英文名ID", requiredMode = Schema.RequiredMode.REQUIRED)
+ @Schema(description = "英文名", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "英文名不能为空")
private String fieldCode;
--
Gitblit v1.9.3