From 19ef4ca4f7252c34fe2e2a03b8868fc997ddd86f Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期五, 13 九月 2024 08:37:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/category/controller/admin/IndItemCategoryController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/category/controller/admin/IndItemCategoryController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/category/controller/admin/IndItemCategoryController.java
index 072dbcf..b6b815c 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/category/controller/admin/IndItemCategoryController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/category/controller/admin/IndItemCategoryController.java
@@ -28,7 +28,7 @@
*/
@Tag(name = "数据平台 - 指标分类")
@RestController
-@RequestMapping("/data/ind-item-category")
+@RequestMapping("/data/ind/category")
@Validated
public class IndItemCategoryController {
@@ -40,6 +40,15 @@
@PreAuthorize("@ss.hasPermission('data:ind-item-category:query')")
public CommonResult<List<IndItemCategoryRespVO>> getList(IndItemCategoryReqVO reqVO) {
List<IndItemCategoryEntity> list = indItemCategoryService.getList(reqVO);
+ list.sort(Comparator.comparing(IndItemCategoryEntity::getSort));
+ return success(BeanUtils.toBean(list, IndItemCategoryRespVO.class));
+ }
+
+ @GetMapping("/list-all-simple")
+ @Operation(summary = "获取指标分类列表", description = "用于【指标分类】界面")
+ @PreAuthorize("@ss.hasPermission('data:ind-item-category:query')")
+ public CommonResult<List<IndItemCategoryRespVO>> getList() {
+ List<IndItemCategoryEntity> list = indItemCategoryService.getSimpleList();
list.sort(Comparator.comparing(IndItemCategoryEntity::getSort));
return success(BeanUtils.toBean(list, IndItemCategoryRespVO.class));
}
@@ -71,7 +80,7 @@
@GetMapping("/get")
@Operation(summary = "获取指标分类信息")
- @PreAuthorize("@ss.hasPermission('system:ind-item-category:query')")
+ @PreAuthorize("@ss.hasPermission('data:ind-item-category:query')")
public CommonResult<IndItemCategoryRespVO> get(String id) {
IndItemCategoryEntity entity = indItemCategoryService.get(id);
return success(BeanUtils.toBean(entity, IndItemCategoryRespVO.class));
--
Gitblit v1.9.3