From d907a822a940c7ec0fb7de0ca845472bda52229b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 14:33:12 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/java/com/zy/asrs/controller/TagController.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TagController.java b/src/main/java/com/zy/asrs/controller/TagController.java
index c5e92f0..dc9125f 100644
--- a/src/main/java/com/zy/asrs/controller/TagController.java
+++ b/src/main/java/com/zy/asrs/controller/TagController.java
@@ -30,7 +30,7 @@
private TreeUtils treeUtils;
@RequestMapping(value = "/tag/list/pda/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.tag_pda_list")
public R pdaList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)Long parentId){
@@ -40,17 +40,19 @@
}
wrapper.orderBy("sort");
List<Tag> tags = tagService.selectList(wrapper);
- return R.ok().add(tags);
+ R r = R.ok();
+ r.put("data",tags);
+ return r;
}
@RequestMapping(value = "/tag/{id}/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.tag_detail")
public R get(@PathVariable("id") String id) {
return R.ok(tagService.selectById(String.valueOf(id)));
}
@RequestMapping(value = "/tag/list/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.tag_list")
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@@ -60,7 +62,9 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.parse("0-鎿嶄綔鎴愬姛").add(tagService.selectList(wrapper));
+ R r = R.parse("0-鎿嶄綔鎴愬姛");
+ r.put("data", tagService.selectList(wrapper));
+ return r;
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
@@ -77,7 +81,7 @@
}
@RequestMapping(value = "/tag/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.tag_add")
public R add(Tag tag) {
tag.setLevel(1);
if (tag.getParentId() != null && tag.getParentId() > 0) {
@@ -101,18 +105,18 @@
tag.setUpdateTime(new Date());
tag.setStatus(1);
tagService.insert(tag);
- return R.ok();
+ return R.ok("response.save_success");
}
@RequestMapping(value = "/tag/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.tag_update")
public R update(Tag tag){
if (Cools.isEmpty(tag) || null==tag.getId()){
- return R.error();
+ return R.error("response.parameter_error");
}
if (tag.getParentId() != null && tag.getParentId() > 0) {
if (tag.getParentId().equals(tag.getId())) {
- return R.error("鏁版嵁閿欒");
+ return R.error("response.data_error");
}
Tag parent = tagService.selectById(tag.getParentId());
if (parent != null) {
@@ -128,7 +132,7 @@
tag.setUpdateBy(getUserId());
tag.setUpdateTime(new Date());
tagService.updateById(tag);
- return R.ok();
+ return R.ok("response.update_success");
}
@RequestMapping(value = "/tag/delete/auth")
@@ -137,7 +141,7 @@
for (Long id : ids){
tagService.deleteById(id);
}
- return R.ok();
+ return R.ok("response.delete_success");
}
@RequestMapping(value = "/tag/export/auth")
@@ -172,13 +176,15 @@
public R query(@RequestBody JSONObject param) {
Wrapper<Tag> wrapper = new EntityWrapper<Tag>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != tagService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(Tag.class, String.valueOf(param.get("key"))));
+ R r = R.parse(BaseRes.REPEAT);
+ r.put("data", getComment(Tag.class, String.valueOf(param.get("key"))));
+ return r;
}
return R.ok();
}
@PostMapping(value = "/tag/tree/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.tag_tree")
public R tree(@RequestParam(required = false, defaultValue = "") String condition) throws IOException, ClassNotFoundException {
ArrayList<Map> tree = treeUtils.getTree(String.valueOf(getOriginTag().getId()));
// 娣辨嫹璐�
--
Gitblit v1.9.1