From af11d4845251da536d564a82fa019b4306875da9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 29 五月 2021 14:48:54 +0800
Subject: [PATCH] Merge branch 'htwms' of https://gitee.com/luxiaotao1123/wms-cloud into htwms
---
src/main/java/zy/cloud/wms/common/web/BaseController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/web/BaseController.java b/src/main/java/zy/cloud/wms/common/web/BaseController.java
index b75fd7a..0769880 100644
--- a/src/main/java/zy/cloud/wms/common/web/BaseController.java
+++ b/src/main/java/zy/cloud/wms/common/web/BaseController.java
@@ -9,6 +9,10 @@
import com.core.exception.CoolException;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
+import zy.cloud.wms.manager.entity.Node;
+import zy.cloud.wms.manager.entity.Tag;
+import zy.cloud.wms.manager.service.NodeService;
+import zy.cloud.wms.manager.service.TagService;
import zy.cloud.wms.system.entity.User;
import zy.cloud.wms.system.service.UserService;
@@ -28,6 +32,10 @@
protected HttpServletRequest request;
@Autowired
private UserService userService;
+ @Autowired
+ private TagService tagService;
+ @Autowired
+ private NodeService nodeService;
protected Long getUserId(){
return Long.parseLong(String.valueOf(request.getAttribute("userId")));
@@ -50,6 +58,22 @@
return "";
}
+ protected Tag getOriginTag(){
+ Tag tag = tagService.selectOne(new EntityWrapper<Tag>().eq("level", 1));
+ if (tag == null) {
+ throw new CoolException("褰掔被鏁版嵁閿欒");
+ }
+ return tag;
+ }
+
+ protected Node getOriginNode(){
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("level", 0));
+ if (node == null) {
+ throw new CoolException("搴撳尯鏁版嵁閿欒");
+ }
+ return node;
+ }
+
/**
* 鍒嗛〉缁勮
* @param pageNumber
@@ -67,7 +91,7 @@
map.put("pageNumber", pageNumber);
map.put("pageSize", pageSize);
- // 鍏ㄥ瓧娈垫ā绯婃悳绱� todo
+ // 鍏ㄥ瓧娈垫ā绯婃悳绱�
if (!Cools.isEmpty(map.get("condition"))) {
Set<String> columns = new HashSet<>();
for (Field field : Cools.getAllFields(cls)){
--
Gitblit v1.9.1