From aa7c4ba35f1201615c18e47e54899a873eea28d3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 27 六月 2020 08:44:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/ResourceController.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/ResourceController.java b/src/main/java/com/zy/system/controller/ResourceController.java
index 400708f..55be712 100644
--- a/src/main/java/com/zy/system/controller/ResourceController.java
+++ b/src/main/java/com/zy/system/controller/ResourceController.java
@@ -3,20 +3,20 @@
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.*;
@RestController
-public class ResourceController extends AbstractBaseController {
+public class ResourceController extends BaseController {
@Autowired
private ResourceService resourceService;
@@ -41,20 +41,21 @@
return R.ok(resourceService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> 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())));
+ 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);
}
}
}
@RequestMapping(value = "/resource/edit/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鑿滃崟缂栬緫")
public R edit(Resource resource) {
if (Cools.isEmpty(resource)){
return R.error();
@@ -71,14 +72,14 @@
}
@RequestMapping(value = "/resource/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鑿滃崟娣诲姞")
public R add(Resource resource) {
resourceService.insert(resource);
return R.ok();
}
@RequestMapping(value = "/resource/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鑿滃崟淇敼")
public R update(Resource resource){
if (Cools.isEmpty(resource) || null==resource.getId()){
return R.error();
@@ -88,7 +89,7 @@
}
@RequestMapping(value = "/resource/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鑿滃崟鍒犻櫎")
public R delete(Integer[] ids){
if (Cools.isEmpty(ids)){
return R.error();
@@ -98,7 +99,7 @@
}
@RequestMapping(value = "/resource/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鑿滃崟瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Resource> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1