From 23f8b9beca05dd2d90bc2a16635f5fcc1754d8c1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期五, 02 四月 2021 20:33:10 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/system/controller/ResourceController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/system/controller/ResourceController.java b/src/main/java/zy/cloud/wms/system/controller/ResourceController.java
index 7aeb045..abea96a 100644
--- a/src/main/java/zy/cloud/wms/system/controller/ResourceController.java
+++ b/src/main/java/zy/cloud/wms/system/controller/ResourceController.java
@@ -3,15 +3,15 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import zy.cloud.wms.common.web.BaseController;
-import zy.cloud.wms.system.entity.Resource;
-import zy.cloud.wms.system.service.ResourceService;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import zy.cloud.wms.common.web.BaseController;
+import zy.cloud.wms.system.entity.Resource;
+import zy.cloud.wms.system.service.ResourceService;
import java.util.*;
@@ -41,6 +41,23 @@
return R.ok(resourceService.selectPage(new Page<>(curr, limit), wrapper));
}
+ @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());
--
Gitblit v1.9.1