From 00b9c782322ad546dd6bd37e6ee27f357557a676 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 24 七月 2020 15:46:57 +0800
Subject: [PATCH] #当前本版十分完美、冻结
---
src/main/java/com/zy/asrs/controller/BasDevpController.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpController.java b/src/main/java/com/zy/asrs/controller/BasDevpController.java
index 297dc68..cd89e40 100644
--- a/src/main/java/com/zy/asrs/controller/BasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDevpController.java
@@ -44,20 +44,21 @@
return R.ok(basDevpService.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 = "/basDevp/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣娣诲姞")
public R add(BasDevp basDevp) {
basDevp.setModiUser(getUserId());
basDevp.setModiTime(new Date());
@@ -68,7 +69,7 @@
}
@RequestMapping(value = "/basDevp/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣淇敼")
public R update(BasDevp basDevp){
if (Cools.isEmpty(basDevp) || null==basDevp.getDevNo()){
return R.error();
@@ -76,11 +77,11 @@
basDevp.setModiUser(getUserId());
basDevp.setModiTime(new Date());
basDevpService.updateById(basDevp);
- return R.ok();
+ return R.ok("淇敼瀹屾垚");
}
@RequestMapping(value = "/basDevp/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣鍒犻櫎")
public R delete(@RequestParam String param){
List<BasDevp> list = JSONArray.parseArray(param, BasDevp.class);
if (Cools.isEmpty(list)){
@@ -93,7 +94,7 @@
}
@RequestMapping(value = "/basDevp/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1