From 604d00f67ddcf25a9d079ceddd1c668b2a4e5288 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 四月 2024 15:08:22 +0800
Subject: [PATCH] bug修复
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbBasicDataConfigController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbBasicDataConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbBasicDataConfigController.java
index 7ef5bc1..3f64498 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbBasicDataConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbBasicDataConfigController.java
@@ -20,6 +20,7 @@
import com.ruoyi.system.vo.BasicDataConfigVO;
import com.ruoyi.system.vo.FieldVO;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import lombok.RequiredArgsConstructor;
@@ -93,17 +94,19 @@
}
/**
- * 分页条件查询字段
- *
- * @param query 字段条件查询对象
- * @return R<PageDTO < FieldVO>>
+ * @param type
+ * @return
*/
@GetMapping("/list-fields")
- @ApiOperation(value = "查询状态为展示中字段列表", notes = "基础数据配置、大屏数据配置")
- public R<List<FieldVO>> listFields() {
+ @ApiOperation(value = "查询状态为展示中的字段列表", notes = "基础数据配置、大屏数据配置")
+ @ApiImplicitParam(name = "type", value = "数字、文本、百分比", required = false, dataType = "string", paramType = "query", dataTypeClass = String.class)
+ public R<List<FieldVO>> listFields(String type) {
try {
- return R.ok(tbFieldService.listFields());
+ return R.ok(tbFieldService.listFields(type));
} catch (Exception e) {
+ if (e instanceof ServiceException) {
+ return R.fail(e.getMessage());
+ }
log.error("查询状态为展示中字段列表异常", e);
return R.fail();
}
--
Gitblit v1.7.1