From 24765c0ad96d3d81b8fe6dfdb7b00279f7026142 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 26 一月 2021 21:51:05 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/utils/NodeUtils.java | 16 ++++++++
src/main/java/zy/cloud/wms/manager/controller/TagController.java | 25 ++++++++++--
src/main/webapp/views/tag/tag.html | 49 +++++++++---------------
3 files changed, 56 insertions(+), 34 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/TagController.java b/src/main/java/zy/cloud/wms/manager/controller/TagController.java
index 55fe09a..9b037fa 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/TagController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/TagController.java
@@ -14,11 +14,9 @@
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Tag;
import zy.cloud.wms.manager.service.TagService;
+import zy.cloud.wms.manager.utils.NodeUtils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class TagController extends BaseController {
@@ -62,6 +60,25 @@
@RequestMapping(value = "/tag/add/auth")
@ManagerAuth
public R add(Tag tag) {
+ tag.setLevel(1);
+ if (tag.getParentId() != null && tag.getParentId() > 0) {
+ Tag parent = tagService.selectById(tag.getParentId());
+ if (parent != null) {
+ tag.setParentName(parent.getName());
+ tag.setLevel(parent.getLevel() + 1);
+ }
+ }
+ // path
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(tag);
+ tag.setPath(nodeUtils.path.toString());
+ tag.setPathName(nodeUtils.pathName.toString());
+
+ tag.setCreateBy(getUserId());
+ tag.setCreateTime(new Date());
+ tag.setUpdateBy(getUserId());
+ tag.setUpdateTime(new Date());
+ tag.setStatus(1);
tagService.insert(tag);
return R.ok();
}
diff --git a/src/main/java/zy/cloud/wms/manager/utils/NodeUtils.java b/src/main/java/zy/cloud/wms/manager/utils/NodeUtils.java
index ba20490..e3ca189 100644
--- a/src/main/java/zy/cloud/wms/manager/utils/NodeUtils.java
+++ b/src/main/java/zy/cloud/wms/manager/utils/NodeUtils.java
@@ -2,7 +2,9 @@
import com.core.common.SpringUtils;
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;
/**
* Created by vincent on 2021/1/19
@@ -26,7 +28,21 @@
pathName.deleteCharAt(0);
}
}
+ }
+ public void executePath(Tag tag) {
+ TagService bean = SpringUtils.getBean(TagService.class);
+ Tag parent = bean.selectById(tag.getParentId());
+ if (null != parent) {
+ path.insert(0, parent.getId()).insert(0,",");
+ pathName.insert(0, parent.getName()).insert(0,",");
+ if (parent.getParentId() != null) {
+ executePath(parent);
+ } else {
+ path.deleteCharAt(0);
+ pathName.deleteCharAt(0);
+ }
+ }
}
}
diff --git a/src/main/webapp/views/tag/tag.html b/src/main/webapp/views/tag/tag.html
index a11bfa3..4debad2 100644
--- a/src/main/webapp/views/tag/tag.html
+++ b/src/main/webapp/views/tag/tag.html
@@ -59,27 +59,9 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">褰掔被鍚嶇О</label>
+ <label class="layui-form-label layui-form-required">绫诲瀷</label>
<div class="layui-input-block">
- <input name="name" placeholder="璇疯緭鍏ュ綊绫诲悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">璐熻矗浜�</label>
- <div class="layui-input-block">
- <input name="leading" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
- </div>
- </div>
-
- </div>
-
- <div class="layui-col-md6">
-
- <div class="layui-form-item">
- <label class="layui-form-label">绫诲瀷</label>
- <div class="layui-input-block">
- <select name="type">
+ <select name="type" lay-vertype="tips" lay-verify="required" required="">
<option value="">璇烽�夋嫨绫诲瀷</option>
<option value="1">鐩掕</option>
<option value="2">琚嬭</option>
@@ -89,20 +71,27 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鐘舵��</label>
+ <label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-block">
- <select name="status">
- <option value="" style="display: none"></option>
- <option value="1">姝ｅ父</option>
- <option value="0">绂佺敤</option>
- </select>
+ <input name="leading" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" class="layui-input">
+ </div>
+ </div>
+
+ </div>
+
+ <div class="layui-col-md6">
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">褰掔被鍚嶇О</label>
+ <div class="layui-input-block">
+ <input name="name" placeholder="璇疯緭鍏ュ綊绫诲悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鎺掑簭</label>
+ <label class="layui-form-label">绠�瑕佹弿杩�</label>
<div class="layui-input-block">
- <input name="sort" placeholder="璇疯緭鍏ユ帓搴�" class="layui-input">
+ <input name="brief" placeholder="璇疯緭鍏ョ畝瑕佹弿杩�" class="layui-input">
</div>
</div>
@@ -162,10 +151,10 @@
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
,{field: 'type$', align: 'center',title: '绫诲瀷'}
,{field: 'leading', align: 'center',title: '璐熻矗浜�'}
- ,{field: 'img', align: 'center',title: '鍥剧墖'}
+ ,{field: 'img', align: 'center',title: '鍥剧墖', hide: true}
// ,{field: 'brief', align: 'center',title: '绠�瑕佹弿杩�'}
// ,{field: 'count', align: 'center',title: '鏁伴噺'}
- ,{field: 'sort', align: 'center',title: '鎺掑簭'}
+ ,{field: 'sort', align: 'center',title: '鎺掑簭', hide: true}
,{field: 'status$', align: 'center',title: '鐘舵��'}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
--
Gitblit v1.9.1