From d3bf3d3917d8201d64e8e2c66e99afb7099487f9 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 17:01:23 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/system/controller/ResourceController.java | 91 ++++++++++++++++++++++++++++++---------------
1 files changed, 61 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/ResourceController.java b/src/main/java/com/zy/system/controller/ResourceController.java
index 12ad261..6c16420 100644
--- a/src/main/java/com/zy/system/controller/ResourceController.java
+++ b/src/main/java/com/zy/system/controller/ResourceController.java
@@ -3,20 +3,23 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.system.entity.Resource;
-import com.zy.system.service.ResourceService;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.core.controller.AbstractBaseController;
+import com.zy.common.web.BaseController;
+import com.zy.system.entity.Resource;
+import com.zy.system.service.ResourceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
-public class ResourceController extends AbstractBaseController {
+public class ResourceController extends BaseController {
@Autowired
private ResourceService resourceService;
@@ -29,11 +32,11 @@
@RequestMapping(value = "/resource/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){
+ 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) {
excludeTrash(param);
EntityWrapper<Resource> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -41,14 +44,33 @@
return R.ok(resourceService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ @RequestMapping(value = "/resource/tree/auth")
+ @ManagerAuth
+ public R tree(@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<Resource> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("sort");
+ }
+ return R.parse("0-鎿嶄綔鎴愬姛").add(resourceService.selectList(wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -56,11 +78,11 @@
@RequestMapping(value = "/resource/edit/auth")
@ManagerAuth(memo = "鑿滃崟缂栬緫")
public R edit(Resource resource) {
- if (Cools.isEmpty(resource)){
+ if (Cools.isEmpty(resource)) {
return R.error();
}
- if (null == resource.getId()){
- if (resource.getSort() == null){
+ if (null == resource.getId()) {
+ if (resource.getSort() == null) {
resource.setSort(999);
}
resourceService.insert(resource);
@@ -77,29 +99,38 @@
return R.ok();
}
- @RequestMapping(value = "/resource/update/auth")
+ @RequestMapping(value = "/resource/update/auth")
@ManagerAuth(memo = "鑿滃崟淇敼")
- public R update(Resource resource){
- if (Cools.isEmpty(resource) || null==resource.getId()){
+ public R update(Resource resource) {
+ if (Cools.isEmpty(resource) || null == resource.getId()) {
return R.error();
}
resourceService.updateById(resource);
return R.ok();
}
+// @RequestMapping(value = "/resource/delete/auth")
+// @ManagerAuth(memo = "鑿滃崟鍒犻櫎")
+// public R delete(Integer[] ids){
+// if (Cools.isEmpty(ids)){
+// return R.error();
+// }
+// resourceService.deleteBatchIds(Arrays.asList(ids));
+// return R.ok();
+// }
+
@RequestMapping(value = "/resource/delete/auth")
- @ManagerAuth(memo = "鑿滃崟鍒犻櫎")
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
- return R.error();
+ @ManagerAuth
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
+ resourceService.deleteById(id);
}
- resourceService.deleteBatchIds(Arrays.asList(ids));
return R.ok();
}
@RequestMapping(value = "/resource/export/auth")
@ManagerAuth(memo = "鑿滃崟瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Resource> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("resource"));
@@ -115,7 +146,7 @@
wrapper.like("name", condition);
Page<Resource> page = resourceService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Resource resource : page.getRecords()){
+ for (Resource resource : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", resource.getId());
map.put("value", resource.getName().concat("(").concat(resource.getLevel$().substring(0, 2).concat(")")));
--
Gitblit v1.9.1