#
luxiaotao1123
2021-01-26 24765c0ad96d3d81b8fe6dfdb7b00279f7026142
#
3个文件已修改
90 ■■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/controller/TagController.java 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/utils/NodeUtils.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/tag/tag.html 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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();
    }
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);
            }
        }
    }
}
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}