From ad81eebcc8d98ad2c0bf85e2125f363e789fa3c7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 二月 2021 16:36:22 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/MatController.java | 8 +
/dev/null | 159 ---------------------------------------
src/main/java/zy/cloud/wms/common/config/CoolExceptionHandler.java | 2
src/main/resources/mapper/MatMapper.xml | 10 ++
src/main/java/zy/cloud/wms/common/web/BaseController.java | 12 +++
src/main/java/zy/cloud/wms/manager/controller/TagController.java | 2
6 files changed, 30 insertions(+), 163 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/config/CoolExceptionHandler.java b/src/main/java/zy/cloud/wms/common/config/CoolExceptionHandler.java
index c848317..cb164df 100644
--- a/src/main/java/zy/cloud/wms/common/config/CoolExceptionHandler.java
+++ b/src/main/java/zy/cloud/wms/common/config/CoolExceptionHandler.java
@@ -26,7 +26,7 @@
@ExceptionHandler(CoolException.class)
public R handleRRException(CoolException e) {
- return R.parse(e.getMessage());
+ return R.error(e.getMessage());
}
}
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..4321d81 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,8 @@
import com.core.exception.CoolException;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
+import zy.cloud.wms.manager.entity.Tag;
+import zy.cloud.wms.manager.service.TagService;
import zy.cloud.wms.system.entity.User;
import zy.cloud.wms.system.service.UserService;
@@ -28,6 +30,8 @@
protected HttpServletRequest request;
@Autowired
private UserService userService;
+ @Autowired
+ private TagService tagService;
protected Long getUserId(){
return Long.parseLong(String.valueOf(request.getAttribute("userId")));
@@ -50,6 +54,14 @@
return "";
}
+ protected Tag getOriginTag(){
+ Tag tag = tagService.selectOne(new EntityWrapper<Tag>().eq("level", 1));
+ if (tag == null) {
+ throw new CoolException("褰掔被鏁版嵁閿欒");
+ }
+ return tag;
+ }
+
/**
* 鍒嗛〉缁勮
* @param pageNumber
diff --git a/src/main/java/zy/cloud/wms/manager/controller/MatController.java b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
index 1e65eb3..5c6f7d8 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/MatController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
@@ -43,8 +43,12 @@
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(matService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+ Page<Mat> page = matService.selectPage(new Page<>(curr, limit), wrapper);
+
+ return R.ok().add(page);
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
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 8cedaf2..c75d20b 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/TagController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/TagController.java
@@ -166,7 +166,7 @@
@PostMapping(value = "/tag/tree/auth")
@ManagerAuth
public R tree(@RequestParam(required = false, defaultValue = "") String condition) throws IOException, ClassNotFoundException {
- ArrayList<Map> tree = treeUtils.getTree("1");
+ ArrayList<Map> tree = treeUtils.getTree(String.valueOf(getOriginTag().getId()));
// 娣辨嫹璐�
List<Map> result = ListUtils.deepCopy(tree);
if (!Cools.isEmpty(condition)) {
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index d8a3053..d34f6f3 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -31,4 +31,14 @@
</resultMap>
+ <select id="listByPageByArea" resultMap="BaseResultMap">
+ SELECT
+ mm.*
+ FROM man_mat mm
+ LEFT JOIN man_tag mt ON mm.`tag_id` = mt.`id`
+ WHERE 1=1
+ AND (FIND_IN_SET(#{tagId}, mt.`path`) OR mt.`id` = #{tagId})
+ ORDER BY mm.create_time DESC
+ </select>
+
</mapper>
diff --git a/src/main/webapp/static/js/tag/tag.js b/src/main/webapp/static/js/tag/tag.js
deleted file mode 100644
index 57ef08c..0000000
--- a/src/main/webapp/static/js/tag/tag.js
+++ /dev/null
@@ -1,324 +0,0 @@
-var pageCurr;
-var tableRender;
-
-layui.config({
- base: baseUrl + "/static/layui/lay/modules/" // 閰嶇疆妯″潡鎵�鍦ㄧ殑鐩綍
-}).use(['table','laydate', 'form','treeTable', 'xmSelect'], function(){
- var table = layui.table;
- var $ = layui.jquery;
- var layer = layui.layer;
- var layDate = layui.laydate;
- var form = layui.form;
- var treeTable = layui.treeTable;
- var xmSelect = layui.xmSelect;
-
- var tableIdx = treeTable.render({
- elem: '#tag',
- url: baseUrl+'/tag/list/auth',
- headers: {token: localStorage.getItem('token')},
- height: 'full-200',
- toolbar: ['<p>',
- '<button lay-event="add" class="layui-btn layui-btn-sm icon-btn"><i class="layui-icon"></i>娣诲姞</button> ',
- '<button lay-event="del" class="layui-btn layui-btn-sm layui-btn-danger icon-btn"><i class="layui-icon"></i>鍒犻櫎</button>',
- '</p>'].join(''),
- tree: {
- iconIndex: 1, // 鎶樺彔鍥炬爣鏄剧ず鍦ㄧ鍑犲垪
- isPidData: true, // 鏄惁鏄痠d銆乸id褰㈠紡鏁版嵁
- idName: 'id', // id瀛楁鍚嶇О
- pidName: 'parentId' // pid瀛楁鍚嶇О
- },
- cols: [[
- {type: 'checkbox'}
- ,{field: 'name', align: 'left',title: '鍚嶇О'}
- ,{field: 'uuid', align: 'center',title: '缂栧彿'}
- // ,{field: 'parentId', align: 'center',title: '鐖剁骇'}
- ,{field: 'parentName', align: 'center',title: '鐖剁骇鍚嶇О'}
- // ,{field: 'path', align: 'center',title: '鍏宠仈璺緞'}
- // ,{field: 'pathName', align: 'center',title: '鍏宠仈璺緞鍚�'}
- ,{field: 'type$', align: 'center',title: '绫诲瀷'}
- ,{field: 'leading', align: 'center',title: '璐熻矗浜�'}
- ,{field: 'img', align: 'center',title: '鍥剧墖'}
- // ,{field: 'brief', align: 'center',title: '绠�瑕佹弿杩�'}
- ,{field: 'count', align: 'center',title: '鏁伴噺'}
- // ,{field: 'level', align: 'center',title: '绛夌骇'}
- ,{field: 'sort', align: 'center',title: '鎺掑簭'}
- ,{field: 'status$', align: 'center',title: '鐘舵��'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
- ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
- ]],
- done: function (data) {
- tableIdx.expandAll();
- // $(".ew-tree-table .ew-tree-table-tool .ew-tree-table-tool-item").css("display", "none");
- // limit()
- }
- });
-
-
- // 澶撮儴宸ュ叿鏍忕偣鍑讳簨浠�
- treeTable.on('toolbar(tag)', function (obj) {
- switch (obj.event) {
- case 'add':
- layer.open({
- type: 2,
- title: '鏂板褰掔被',
- offset: '100px',
- skin: 'layui-cool-class',
- area: ['35%', top.detailHeight],
- content: 'tag_detail.html',
- success: function(layero, index){
- layer.getChildFrame('#data-detail-submit-edit', index).hide();
- clearFormVal(layer.getChildFrame('#detail', index));
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
-
- // 娓叉煋涓嬫媺鏍�
- var insXmSel = xmSelect.render({
- el: '#tagParentSel',
- height: '250px',
- data: tableIdx.options.data,
- initValue: [],
- model: {label: {type: 'text'}},
- prop: {
- name: 'name',
- value: 'id'
- },
- radio: true,
- clickClose: true,
- tree: {
- show: true,
- indent: 15,
- strict: false,
- expandedKeys: true
- }
- });
- // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
- }
- });
- break;
- case 'delete':
- layer.msg('绂佺敤');
- break;
- case 'update':
- layer.msg('绂佺敤');
- break;
- }
- });
-
-
- // 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(tag)', function(obj){
- var data = obj.data;
- switch (obj.event) {
- // 缂栬緫
- case 'edit':
- layer.open({
- type: 2,
- title: '淇敼',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- content: 'tag_detail.html',
- success: function(layero, index){
- layer.getChildFrame('#data-detail-submit-save', index).hide();
- setFormVal(layer.getChildFrame('#detail', index), data, false);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
- top.convertDisabled(layer.getChildFrame('#id', index), true);
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- }
- });
- break;
-
- }
- });
-
- // 鏁版嵁淇濆瓨鍔ㄤ綔
- form.on('submit(save)', function () {
- if (banMsg != null){
- layer.msg(banMsg);
- return;
- }
- method("add");
- });
-
- // 鏁版嵁淇敼鍔ㄤ綔
- form.on('submit(edit)', function () {
- method("update")
- });
-
- function method(name){
- var index = layer.load(1, {
- shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
- });
- var data = {
-// id: $('#id').val(),
- id: $('#id').val(),
- uuid: $('#uuid').val(),
- name: $('#name').val(),
- parentId: $('#parentId').val(),
- parentName: $('#parentName').val(),
- path: $('#path').val(),
- pathName: $('#pathName').val(),
- type: $('#type').val(),
- leading: $('#leading').val(),
- img: $('#img').val(),
- brief: $('#brief').val(),
- count: $('#count').val(),
- level: $('#level').val(),
- sort: $('#sort').val(),
- status: $('#status').val(),
- createTime: top.strToDate($('#createTime\\$').val()),
- createBy: $('#createBy').val(),
- updateTime: top.strToDate($('#updateTime\\$').val()),
- updateBy: $('#updateBy').val(),
- memo: $('#memo').val(),
-
- };
- $.ajax({
- url: baseUrl+"/tag/"+name+"/auth",
- headers: {'token': localStorage.getItem('token')},
- data: top.reObject(data),
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- parent.layer.closeAll();
- parent.$(".layui-laypage-btn")[0].click();
- $("#data-detail :input").each(function () {
- $(this).val("");
- });
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- layer.close(index);
- }
- })
- }
-
- // 澶嶉�夋浜嬩欢
- form.on('checkbox(detailCheckbox)', function (data) {
- var el = data.elem;
- if (el.checked) {
- $(el).val('Y');
- } else {
- $(el).val('N');
- }
- });
-
- // 鎼滅储鏍忔悳绱簨浠�
- form.on('submit(search)', function (data) {
- pageCurr = 1;
- tableReload(false);
- });
-
- // 鎼滅储鏍忛噸缃簨浠�
- form.on('submit(reset)', function (data) {
- pageCurr = 1;
- clearFormVal($('#search-box'));
- tableReload(false);
- });
-
- // 鏃堕棿閫夋嫨鍣�
- layDate.render({
- elem: '#createTime\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '#updateTime\\$',
- type: 'datetime'
- });
-
-
-});
-
-// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
- parent.layer.closeAll();
-});
-
-function tableReload(child) {
- var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- (child ? parent.tableIns : tableIns).reload({
- where: searchData,
- page: {
- curr: pageCurr
- },
- done: function (res, curr, count) {
- if (res.code === 403) {
- top.location.href = baseUrl+"/";
- }
- pageCurr=curr;
- if (res.data.length === 0 && count !== 0) {
- tableIns.reload({
- where: searchData,
- page: {
- curr: pageCurr-1
- }
- });
- pageCurr -= 1;
- }
- limit(child);
- }
- });
-}
-
-function setFormVal(el, data, showImg) {
- for (var val in data) {
- var find = el.find(":input[id='" + val + "']");
- if (find[0]!=null){
- if (find[0].type === 'checkbox'){
- if (data[val]==='Y'){
- find.attr("checked","checked");
- find.val('Y');
- } else {
- find.remove("checked");
- find.val('N');
- }
- continue;
- }
- }
- find.val(data[val]);
- if (showImg){
- var next = find.next();
- if (next.get(0)){
- if (next.get(0).localName === "img") {
- find.hide();
- next.attr("src", data[val]);
- next.show();
- }
- }
- }
- }
-}
-
-function clearFormVal(el) {
- $(':input', el)
- .val('')
- .removeAttr('checked')
- .removeAttr('selected');
-}
-
-function detailScreen(index) {
- var detail = layer.getChildFrame('#data-detail', index);
- var height = detail.height()+60;
- if (height > ($(window).height()*0.9)) {
- height = ($(window).height()*0.8);
- }
- layer.style(index, {
-// top: (($(window).height()-height)/3)+"px",
- height: height+'px'
- });
-}
-
-$('body').keydown(function () {
- if (event.keyCode === 13) {
- $("#search").click();
- }
-});
diff --git a/src/main/webapp/views/tag/tag_detail.html b/src/main/webapp/views/tag/tag_detail.html
deleted file mode 100644
index 87f80cd..0000000
--- a/src/main/webapp/views/tag/tag_detail.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <title></title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../static/css/cool.css" media="all">
-<!-- <link rel="stylesheet" href="../../static/css/common.css" media="all">-->
- <style>
- #detail {
- padding: 25px 20px 0 0;
- margin: 0;
- }
- .layui-col-md6 {
- width: 50%;
- float: left;
- }
- body {
- color: #595959;!important;
- }
- ::-webkit-input-placeholder {
- color: #c1c1c1;
- }
- .layui-form.model-form>.layui-form-item:last-child {
- padding-bottom: 20px;
- }
- .text-right {
- text-align: right;
- }
-
-</style>
-</head>
-<body>
-
-<!-- 璇︽儏 -->
-<div id="data-detail" class="layer_self_wrap">
- <form id="detail" class="layui-form">
- <input id="id" type="hidden">
- <input id="uuid" type="hidden">
- <input id="path" type="hidden">
- <input id="pathName" type="hidden">
- <input id="img" type="hidden">
- <input id="brief" type="hidden">
- <input id="level" type="hidden">
- <input id="count" type="hidden">
- <input id="createTime$" type="hidden">
- <input id="createBy" type="hidden">
- <input id="updateTime$" type="hidden">
- <input id="updateBy" type="hidden">
- <div class="layui-row">
-
- <div class="layui-col-md6">
-
- <div class="layui-form-item">
- <label class="layui-form-label">涓婄骇鑿滃崟</label>
- <div class="layui-input-block">
- <div id="tagParentSel" class="ew-xmselect-tree"></div>
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">褰掔被鍚嶇О</label>
- <div class="layui-input-block">
- <input id="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 id="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 id="type">
- <option value="" style="display: none"></option>
- <option value="1">鐩掕</option>
- <option value="2">琚嬭</option>
- <option value="0">鍏朵粬</option>
- </select>
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">鐘舵��</label>
- <div class="layui-input-block">
- <select id="status">
- <option value="" style="display: none"></option>
- <option value="1">姝ｅ父</option>
- <option value="0">绂佺敤</option>
- </select>
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">鎺掑簭</label>
- <div class="layui-input-block">
- <input id="sort" 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 id="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
- </div>
- </div>
-
- </div>
- </div>
- <hr class="layui-bg-gray">
- <div class="layui-form-item text-right">
- <button class="layui-btn" lay-filter="authoritiesEditSubmit" lay-submit="">淇濆瓨</button>
- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
- </div>
-<!-- <div class="layui-inline" style="width:44%;">-->
-<!-- <label class="layui-form-label">鐖躲��銆�绾э細</label>-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input id="parentId" class="layui-input" type="text" lay-verify="number" >-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-inline" style="width:50%;display: none">-->
-<!-- <label class="layui-form-label">鐖剁骇鍚嶇О锛�</label>-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input id="parentName" class="layui-input" type="text">-->
-<!-- </div>-->
-<!-- </div>-->
-
-<!-- <hr class="layui-bg-gray">-->
-
-<!-- <div id="data-detail-btn" class="layui-btn-container layui-form-item">-->
-<!-- <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>-->
-<!-- <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>-->
-<!-- <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>-->
-<!-- </div>-->
-
-<!-- <div id="prompt">-->
-<!-- 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>-->
-<!-- </div>-->
- </form>
-</div>
-</body>
-<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
-<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/tag/tag.js" charset="utf-8"></script>
-</html>
-
--
Gitblit v1.9.1