From 12e16a4e48fa33ead5aae7ca065fdea636135527 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期二, 13 八月 2024 12:55:26 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
index 45aa04e..d1fbe84 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
@@ -42,6 +42,20 @@
@Autowired
private TreeUtils treeUtils;
+
+ @RequestMapping(value = "/tag/list/pda/auth")
+ @ManagerAuth
+ public R pdaList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)Long parentId){
+ LambdaQueryWrapper<Tag> tagLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if(!Cools.isEmpty(parentId)) {
+ tagLambdaQueryWrapper.eq(Tag::getParentId, parentId == null ? getOriginTag().getId() : parentId);
+ }
+ List<Tag> tags = tagService.list(tagLambdaQueryWrapper);
+ return R.ok().add(tags);
+ }
+
@RequestMapping(value = "/tag/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
@@ -208,6 +222,16 @@
.doWrite(excels);
}
+// // excel瀵煎叆-------鍒ゆ柇鏄惁鏈夐噸澶嶇墿鏂�
+// @PostMapping(value = "/mat/excel/import/check/auth")
+// @ManagerAuth(memo = "鍟嗗搧妗f鏁版嵁瀵煎叆")
+// @Transactional
+// public R matExcelImportCheck(MultipartFile file) throws IOException {
+// MatExcelListener listener = new MatExcelListener(getUserId(), getHostId());
+// EasyExcel.read(file.getInputStream(), MatExcel.class, listener).sheet().doRead();
+// return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
+// }
+
// excel瀵煎叆
@PostMapping(value = "/mat/excel/import/auth")
@ManagerAuth(memo = "鍟嗗搧妗f鏁版嵁瀵煎叆")
--
Gitblit v1.9.1