From b6cec9be5a055f9c254e2158b6556acb9700bc90 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 10 四月 2025 08:17:43 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/ApiConfigController.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ApiConfigController.java b/src/main/java/com/zy/asrs/controller/ApiConfigController.java
index 41e40ad..8fd4bbb 100644
--- a/src/main/java/com/zy/asrs/controller/ApiConfigController.java
+++ b/src/main/java/com/zy/asrs/controller/ApiConfigController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.ApiConfig;
+import com.zy.asrs.entity.WrkDetlLog;
import com.zy.asrs.service.ApiConfigService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -30,6 +31,20 @@
return R.ok(apiConfigService.selectById(String.valueOf(id)));
}
+// @RequestMapping(value = "/apiConfig/list/auth")
+//// @ManagerAuth
+// public R list(@RequestParam(defaultValue = "1")Integer curr,
+// @RequestParam(defaultValue = "10")Integer limit,
+// @RequestParam(required = false)String orderByField,
+// @RequestParam(required = false)String orderByType,
+// @RequestParam Map<String, Object> param){
+// EntityWrapper<ApiConfig> wrapper = new EntityWrapper<>();
+// excludeTrash(param);
+// convert(param, wrapper);
+// if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+// return R.ok(apiConfigService.selectPage(new Page<>(curr, limit), wrapper));
+// }
+
@RequestMapping(value = "/apiConfig/list/auth")
// @ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@@ -37,11 +52,27 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
- EntityWrapper<ApiConfig> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(apiConfigService.selectPage(new Page<>(curr, limit), wrapper));
+ try {
+ long id = 0;
+ String url = null;
+ for (Map.Entry<String, Object> entry : param.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (Cools.isEmpty(val)) {
+ continue;
+ }
+ if (entry.getKey().equals("id")) {
+ id = Long.getLong(val);
+ }else if (entry.getKey().equals("url")) {
+ url = val;
+ }
+ }
+ List<ApiConfig> apiConfigList = apiConfigService.selectApiConfigList(id,url, curr, limit);
+ Page<ApiConfig> page1 = new Page<ApiConfig>(curr, limit).setRecords(apiConfigList);
+ page1.setTotal(apiConfigService.selectApiConfigListTotal(id,url));
+ return R.ok(page1);
+ } catch (Exception e) {
+ return R.error("寮傚父" + e);
+ }
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
--
Gitblit v1.9.1