From b9d45f1ae21e52e933b2b762e2b1b8f0c63bd6b1 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 04 七月 2024 08:07:16 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TagMapper.java | 12
zy-asrs-admin/src/views/base/tag/index.vue | 275 +++++++++++++++++
zy-asrs-framework/src/main/resources/templates/vue/Edit.txt | 6
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java | 6
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Tag.java | 282 +++++++++++++++++
zy-asrs-wms/src/main/java/tag.sql | 9
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TagService.java | 8
/dev/null | 9
zy-asrs-admin/src/views/base/tag/edit.vue | 178 +++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java | 1
zy-asrs-admin/src/views/IndexView.vue | 34 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TagServiceImpl.java | 12
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TagController.java | 115 +++++++
zy-asrs-wms/src/main/resources/mapper/asrs/TagMapper.xml | 5
zy-asrs-admin/src/views/system/dept/edit.vue | 6
15 files changed, 927 insertions(+), 31 deletions(-)
diff --git a/zy-asrs-admin/src/views/IndexView.vue b/zy-asrs-admin/src/views/IndexView.vue
index 0c0a1b1..343dfd6 100644
--- a/zy-asrs-admin/src/views/IndexView.vue
+++ b/zy-asrs-admin/src/views/IndexView.vue
@@ -194,29 +194,31 @@
<template>
<a-layout class="main">
- <a-layout-sider v-model:collapsed="collapsed" :trigger="null" collapsible>
+ <a-layout-sider v-model:collapsed="collapsed" :trigger="null" collapsible theme="dark">
<div class="logo" />
- <a-menu v-for="(item, index) in menuCache" :key="index" v-model:selectedKeys="selectedKeys" @select="menuSelect"
- theme="dark" mode="inline">
+ <a-menu v-model:selectedKeys="selectedKeys" @select="menuSelect" theme="dark" mode="inline">
<div>
<a-menu-item key="/" name="涓婚〉">
<HomeOutlined /> {{ formatMessage('common.home', '涓婚〉') }}
</a-menu-item>
</div>
- <a-sub-menu v-if="item.type == 0">
- <template #title>
- <span>
- <component :is="components[ref(item.icon).value]" />
- {{ formatMessage(item.languageId, item.name) }}
- </span>
- </template>
- <div v-for="(child, idx) in item.children">
- <a-menu-item v-if="child.status == 1" :key="child.route" :name="child.name" :languageId="child.languageId">
- {{ formatMessage(child.languageId, child.name) }}
- </a-menu-item>
- </div>
- </a-sub-menu>
+ <div v-for="(item, index) in menuCache" :key="index">
+ <a-sub-menu :key="index" v-if="item.type == 0">
+ <template #title>
+ <span>
+ <component :is="components[ref(item.icon).value]" />
+ {{ formatMessage(item.languageId, item.name) }}
+ </span>
+ </template>
+ <div v-for="(child, idx) in item.children">
+ <a-menu-item v-if="child.status == 1" :key="child.route" :name="child.name"
+ :languageId="child.languageId">
+ {{ formatMessage(child.languageId, child.name) }}
+ </a-menu-item>
+ </div>
+ </a-sub-menu>
+ </div>
</a-menu>
</a-layout-sider>
diff --git a/zy-asrs-admin/src/views/base/tag/edit.vue b/zy-asrs-admin/src/views/base/tag/edit.vue
new file mode 100644
index 0000000..437794a
--- /dev/null
+++ b/zy-asrs-admin/src/views/base/tag/edit.vue
@@ -0,0 +1,178 @@
+<script setup>
+import { ref, nextTick } from 'vue';
+import { get, post, postBlob, postForm } from '@/utils/request.js'
+import { formatMessage } from '@/utils/localeUtils.js';
+import { message } from 'ant-design-vue';
+
+const formTable = ref(null);
+const submitButton = ref(null);
+const isSave = ref(true);
+const open = ref(false);
+const initFormData = {}
+let formData = ref(initFormData);
+
+let treeData = ref(null);
+
+const emit = defineEmits(['tableReload'])
+
+const handleOk = (e) => {
+ nextTick(() => {
+ setTimeout(() => {
+ submitButton.value.$el.click();
+ }, 100);
+ });
+};
+
+const onFinish = values => {
+ // console.log('Success:', values);
+ open.value = false;
+ post(isSave.value ? '/api/tag/save' : '/api/tag/update', formData.value).then((resp) => {
+ let result = resp.data;
+ if (result.code === 200) {
+ message.success(formatMessage('page.update.success', '鏇存柊鎴愬姛'));
+ } else {
+ message.error(result.msg);
+ }
+ emit('tableReload', 'reload')
+ nextTick(() => {
+ formTable.value.resetFields()
+ })
+ })
+};
+const onFinishFailed = errorInfo => {
+ console.log('Failed:', errorInfo);
+};
+
+const UserQueryList = ref(null);
+UserQuery();
+function UserQuery() {
+ postForm('/api/user/query', {}).then(resp => {
+ let result = resp.data;
+ UserQueryList.value = result.data;
+ })
+}
+
+
+defineExpose({
+ open,
+ formData,
+ initFormData,
+ isSave,
+ treeData,
+})
+
+</script>
+
+<script>
+export default {
+ name: '褰掔被绠＄悊-edit'
+}
+</script>
+
+<template>
+ <div>
+ <a-modal v-model:open="open"
+ :title="isSave ? formatMessage('page.add', '娣诲姞') : formatMessage('page.edit', '缂栬緫')" @ok="handleOk"
+ style="width: 600px;">
+ <a-form :model="formData" ref="formTable" name="formTable" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }"
+ style="display: flex;justify-content: space-between;flex-wrap: wrap;" autocomplete="off"
+ @finish="onFinish" @finishFailed="onFinishFailed">
+ <!-- <a-form-item :label="formatMessage('db.man_tag.uuid', '缂栧彿')" name="uuid" style="width: 250px;">
+ <a-input v-model:value="formData.uuid" />
+ </a-form-item> -->
+ <a-form-item label="涓婄骇鑿滃崟" name="parentId" style="width: 250px;"
+ :rules="[{ required: true, message: '涓婄骇鑿滃崟涓嶈兘涓虹┖!' }]">
+ <a-tree-select v-model:value="formData.parentId" show-search style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :placeholder="formatMessage('page.input', '璇疯緭鍏�')" allow-clea tree-data-simple-mode
+ :tree-data="treeData" tree-node-filter-prop="name" :field-names="{
+ children: 'children',
+ label: 'name',
+ value: 'id',
+ }">
+ <template #title="{ value: id, name }">
+ {{ name }}
+ </template>
+ </a-tree-select>
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_tag.name', '鍚嶇О')" name="name" style="width: 250px;">
+ <a-input v-model:value="formData.name" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_tag.flag', '鏍囪瘑')" name="flag" style="width: 250px;">
+ <a-input v-model:value="formData.flag" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_tag.status', '鐘舵��')" name="status" style="width: 250px;">
+ <a-select v-model:value="formData.status" :options="[
+ { label: '姝ｅ父', value: 1 },
+ { label: '绂佺敤', value: 0 },
+ ]">
+ </a-select>
+ </a-form-item>
+ <!-- <a-form-item :label="formatMessage('db.man_tag.create_time', '娣诲姞鏃堕棿')" name="createTime"
+ style="width: 250px;">
+ <a-date-picker v-model:value="formData.createTime" show-time format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_tag.create_by', '娣诲姞浜哄憳')" name="createBy"
+ style="width: 250px;">
+ <a-select v-model:value="formData.createBy" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
+ style="width: 100%" show-search :options="UserQueryList" optionFilterProp="label"
+ optionLabelProp="label">
+ </a-select>
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_tag.update_time', '淇敼鏃堕棿')" name="updateTime"
+ style="width: 250px;">
+ <a-date-picker v-model:value="formData.updateTime" show-time format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_tag.update_by', '淇敼浜哄憳')" name="updateBy"
+ style="width: 250px;">
+ <a-select v-model:value="formData.updateBy" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
+ style="width: 100%" show-search :options="UserQueryList" optionFilterProp="label"
+ optionLabelProp="label">
+ </a-select>
+ </a-form-item> -->
+ <a-form-item :label="formatMessage('db.man_tag.memo', '澶囨敞')" name="memo" style="width: 250px;">
+ <a-input v-model:value="formData.memo" />
+ </a-form-item>
+ <!-- <a-form-item :label="formatMessage('db.man_tag.parent_id', '鐖剁骇')" name="parentId"
+ style="width: 250px;">
+ <a-input v-model:value="formData.parentId" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_tag.parent_name', '鐖剁骇鍚嶇О')" name="parentName"
+ style="width: 250px;">
+ <a-input v-model:value="formData.parentName" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_tag.path', '鍏宠仈璺緞')" name="path" style="width: 250px;">
+ <a-input v-model:value="formData.path" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_tag.path_name', '鍏宠仈璺緞鍚�')" name="pathName"
+ style="width: 250px;">
+ <a-input v-model:value="formData.pathName" />
+ </a-form-item> -->
+ <a-form-item :label="formatMessage('db.man_tag.type', '绫诲瀷')" name="type" style="width: 250px;">
+ <a-select v-model:value="formData.type" :options="[
+ { label: '鍏朵粬', value: 0 },
+ ]">
+ </a-select>
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_tag.count', '鏁伴噺')" name="count" style="width: 250px;">
+ <a-input v-model:value="formData.count" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_tag.level', '绛夌骇')" name="level" style="width: 250px;">
+ <a-input v-model:value="formData.level" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_tag.sort', '鎺掑簭')" name="sort" style="width: 250px;">
+ <a-input v-model:value="formData.sort" />
+ </a-form-item>
+
+ <a-form-item>
+ <a-button type="primary" html-type="submit" ref="submitButton"
+ style="visibility: hidden;">Submit</a-button>
+ </a-form-item>
+ </a-form>
+ </a-modal>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-admin/src/views/base/tag/index.vue b/zy-asrs-admin/src/views/base/tag/index.vue
new file mode 100644
index 0000000..f8520dd
--- /dev/null
+++ b/zy-asrs-admin/src/views/base/tag/index.vue
@@ -0,0 +1,275 @@
+<script setup>
+import { getCurrentInstance, ref, computed, reactive } from 'vue';
+import { useRouter } from "vue-router";
+import { get, post, postBlob } from '@/utils/request.js'
+import { message, Modal } from 'ant-design-vue';
+import { logout } from '@/config.js';
+import EditView from './edit.vue'
+import { formatMessage } from '@/utils/localeUtils.js';
+const context = getCurrentInstance()?.appContext.config.globalProperties;
+
+const router = useRouter();
+
+const TABLE_KEY = 'table-tag';
+let currentPage = 1;
+let pageSize = 10;
+const searchInput = ref("")
+const editChild = ref(null)
+
+let tableData = ref([]);
+getPage();
+
+const columns = [
+ // {
+ // title: formatMessage('db.man_tag.uuid', '缂栧彿'),
+ // dataIndex: 'uuid',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ {
+ title: formatMessage('db.man_tag.name', '鍚嶇О'),
+ dataIndex: 'name',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.man_tag.flag', '鏍囪瘑'),
+ dataIndex: 'flag',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.man_tag.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ },
+ // {
+ // title: formatMessage('db.man_tag.create_time', '娣诲姞鏃堕棿'),
+ // dataIndex: 'createTime$',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ // {
+ // title: formatMessage('db.man_tag.create_by', '娣诲姞浜哄憳'),
+ // dataIndex: 'createBy$',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ // {
+ // title: formatMessage('db.man_tag.update_time', '淇敼鏃堕棿'),
+ // dataIndex: 'updateTime$',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ // {
+ // title: formatMessage('db.man_tag.update_by', '淇敼浜哄憳'),
+ // dataIndex: 'updateBy$',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ {
+ title: formatMessage('db.man_tag.memo', '澶囨敞'),
+ dataIndex: 'memo',
+ width: 140,
+ ellipsis: true,
+ },
+ // {
+ // title: formatMessage('db.man_tag.parent_id', '鐖剁骇'),
+ // dataIndex: 'parentId',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ // {
+ // title: formatMessage('db.man_tag.parent_name', '鐖剁骇鍚嶇О'),
+ // dataIndex: 'parentName',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ // {
+ // title: formatMessage('db.man_tag.path', '鍏宠仈璺緞'),
+ // dataIndex: 'path',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ // {
+ // title: formatMessage('db.man_tag.path_name', '鍏宠仈璺緞鍚�'),
+ // dataIndex: 'pathName',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ {
+ title: formatMessage('db.man_tag.type', '绫诲瀷'),
+ dataIndex: 'type$',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.man_tag.count', '鏁伴噺'),
+ dataIndex: 'count',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.man_tag.level', '绛夌骇'),
+ dataIndex: 'level',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.man_tag.sort', '鎺掑簭'),
+ dataIndex: 'sort',
+ width: 140,
+ ellipsis: true,
+ },
+
+ {
+ title: formatMessage('common.operation', '鎿嶄綔'),
+ name: 'oper',
+ dataIndex: 'oper',
+ key: 'oper',
+ width: 140,
+ },
+];
+
+const state = reactive({
+ selectedRowKeys: [],
+ loading: false,
+});
+const hasSelected = computed(() => state.selectedRowKeys.length > 0);
+const start = () => {
+ state.loading = true;
+ // ajax request after empty completing
+ setTimeout(() => {
+ state.loading = false;
+ state.selectedRowKeys = [];
+ }, 1000);
+};
+const onSelectChange = selectedRowKeys => {
+ // console.log('selectedRowKeys changed: ', selectedRowKeys);
+ state.selectedRowKeys = selectedRowKeys;
+};
+
+function getPage() {
+ post('/api/tag/tree', {
+ current: currentPage,
+ pageSize: pageSize,
+ condition: searchInput.value
+ }).then((resp) => {
+ let result = resp.data;
+ if (result.code == 200) {
+ let data = result.data;
+ tableData.value = data;
+
+ editChild.value.treeData = [{
+ id: 0,
+ name: '鍏ㄩ儴',
+ children: data
+ }];
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+const handleEdit = (item) => {
+ editChild.value.open = true;
+ editChild.value.formData = item == null ? editChild.value.initFormData : JSON.parse(JSON.stringify(item));
+ editChild.value.isSave = item == null;
+}
+
+const handleDel = (rows) => {
+ Modal.confirm({
+ title: formatMessage('page.delete', '鍒犻櫎'),
+ content: formatMessage('page.delete.confirm', '纭畾鍒犻櫎璇ラ」鍚楋紵'),
+ maskClosable: true,
+ onOk: async () => {
+ const hide = message.loading(formatMessage('common.loading', '璇锋眰涓�'));
+ try {
+ post('/api/tag/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
+ let result = resp.data;
+ if (result.code === 200) {
+ message.success(result.msg);
+ } else {
+ message.error(result.msg);
+ }
+ getPage()
+ hide()
+ })
+ } catch (error) {
+ message.error(formatMessage('common.fail', '璇锋眰澶辫触'));
+ }
+ },
+ });
+}
+
+const handleExport = async (intl) => {
+ postBlob('/api/tag/export', {}).then(result => {
+ const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
+ window.location.href = window.URL.createObjectURL(blob);
+ return true;
+ })
+};
+
+const onSearch = () => {
+ // console.log('search');
+ getPage()
+}
+
+const onPageChange = (page, size) => {
+ currentPage = page;
+ pageSize = size;
+ getPage();
+}
+
+function handleTableReload(value) {
+ getPage()
+}
+
+</script>
+
+<script>
+export default {
+ name: '褰掔被绠＄悊'
+}
+</script>
+
+<template>
+ <div>
+ <EditView ref="editChild" @tableReload="handleTableReload" />
+ <div class="table-header">
+ <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
+ style="width: 200px;" @search="onSearch" />
+ <div class="table-header-right">
+ <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
+ <a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
+ </div>
+ </div>
+
+ <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
+ :data-source="tableData" :defaultExpandAllRows="false" key="menu" rowKey="id">
+ <a-table-column :title="formatMessage('db.man_tag.name', '鍚嶇О')" key="name" data-index="name" />
+ <a-table-column :title="formatMessage('db.man_tag.flag', '鏍囪瘑')" key="flag" data-index="flag" />
+ <a-table-column :title="formatMessage('db.man_tag.status', '鐘舵��')" key="status$" data-index="status$" />
+ <a-table-column :title="formatMessage('db.man_tag.memo', '澶囨敞')" key="memo" data-index="memo" />
+ <a-table-column :title="formatMessage('db.man_tag.count', '鏁伴噺')" key="count" data-index="count" />
+ <a-table-column :title="formatMessage('db.man_tag.level', '绛夌骇')" key="level" data-index="level" />
+ <a-table-column :title="formatMessage('db.sys_menu.sort', '鎺掑簭')" key="sort" data-index="sort" />
+ <a-table-column :title="formatMessage('db.sys_menu.status', '鐘舵��')" key="status$" data-index="status$" />
+ <a-table-column :title="formatMessage('common.operation', '鎿嶄綔')" key="oper" data-index="oper">
+ <template #default="{ record }">
+ <div style="display: flex;justify-content: space-evenly;">
+ <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫') }}</a-button>
+ <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
+ }}</a-button>
+ </div>
+ </template>
+ </a-table-column>
+ </a-table>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-admin/src/views/system/dept/edit.vue b/zy-asrs-admin/src/views/system/dept/edit.vue
index b7b5ee0..6aaecef 100644
--- a/zy-asrs-admin/src/views/system/dept/edit.vue
+++ b/zy-asrs-admin/src/views/system/dept/edit.vue
@@ -4,6 +4,7 @@
import { formatMessage } from '@/utils/localeUtils.js';
import { message } from 'ant-design-vue';
+const formTable = ref(null);
const submitButton = ref(null);
const isSave = ref(true);
const open = ref(false);
@@ -32,6 +33,9 @@
message.error(result.msg);
}
emit('tableReload', 'reload')
+ nextTick(() => {
+ formTable.value.resetFields()
+ })
})
};
const onFinishFailed = errorInfo => {
@@ -69,7 +73,7 @@
<a-modal v-model:open="open"
:title="isSave ? formatMessage('page.add', '娣诲姞') : formatMessage('page.edit', '缂栬緫')" @ok="handleOk"
style="width: 600px;">
- <a-form :model="formData" name="formTable" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }"
+ <a-form :model="formData" ref="formTable" name="formTable" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }"
style="display: flex;justify-content: space-between;flex-wrap: wrap;" autocomplete="off"
@finish="onFinish" @finishFailed="onFinishFailed">
<a-form-item label="涓婄骇閮ㄩ棬" name="parentId" style="width: 250px;"
diff --git a/zy-asrs-framework/src/main/resources/templates/vue/Edit.txt b/zy-asrs-framework/src/main/resources/templates/vue/Edit.txt
index c8b4933..28d6d82 100644
--- a/zy-asrs-framework/src/main/resources/templates/vue/Edit.txt
+++ b/zy-asrs-framework/src/main/resources/templates/vue/Edit.txt
@@ -4,6 +4,7 @@
import { formatMessage } from '@/utils/localeUtils.js';
import { message } from 'ant-design-vue';
+const formTable = ref(null);
const submitButton = ref(null);
const isSave = ref(true);
const open = ref(false);
@@ -31,6 +32,9 @@
message.error(result.msg);
}
emit('tableReload', 'reload')
+ nextTick(() => {
+ formTable.value.resetFields()
+ })
})
};
const onFinishFailed = errorInfo => {
@@ -59,7 +63,7 @@
<a-modal v-model:open="open"
:title="isSave ? formatMessage('page.add', '娣诲姞') : formatMessage('page.edit', '缂栬緫')" @ok="handleOk"
style="width: 600px;">
- <a-form :model="formData" name="formTable" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }"
+ <a-form :model="formData" ref="formTable" name="formTable" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }"
style="display: flex;justify-content: space-between;flex-wrap: wrap;" autocomplete="off"
@finish="onFinish" @finishFailed="onFinishFailed">
@{FORMEDITCOLUMNS}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TagController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TagController.java
new file mode 100644
index 0000000..604ddf7
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TagController.java
@@ -0,0 +1,115 @@
+package com.zy.asrs.wms.asrs.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.common.annotation.OperationLog;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.KeyValVo;
+import com.zy.asrs.wms.common.domain.PageParam;
+import com.zy.asrs.wms.asrs.entity.Tag;
+import com.zy.asrs.wms.asrs.service.TagService;
+import com.zy.asrs.wms.system.controller.BaseController;
+import com.zy.asrs.wms.utils.ExcelUtil;
+import com.zy.asrs.wms.utils.Utils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class TagController extends BaseController {
+
+ @Autowired
+ private TagService tagService;
+
+ @PreAuthorize("hasAuthority('asrs:tag:list')")
+ @PostMapping("/tag/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Tag, BaseParam> pageParam = new PageParam<>(baseParam, Tag.class);
+ return R.ok().add(tagService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:tag:list')")
+ @PostMapping("/tag/tree")
+ public R tree(@RequestBody Map<String, Object> map) {
+ List<Tag> tagList = tagService.list(new LambdaQueryWrapper<Tag>().orderByAsc(Tag::getSort));
+ List<Tag> treeData = Utils.toTreeData(tagList, 0L, Tag::getParentId, Tag::getId, Tag::setChildren);
+ if (!Cools.isEmpty(map.get("condition"))) {
+ Utils.treeRemove(treeData, String.valueOf(map.get("condition")), Tag::getName, Tag::getChildren);
+ Utils.treeRemove(treeData, String.valueOf(map.get("condition")), Tag::getName, Tag::getChildren);
+ }
+ return R.ok().add(treeData);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:tag:list')")
+ @PostMapping("/tag/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(tagService.list());
+ }
+
+ @PreAuthorize("hasAuthority('asrs:tag:list')")
+ @GetMapping("/tag/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(tagService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:tag:save')")
+ @OperationLog("娣诲姞褰掔被绠＄悊")
+ @PostMapping("/tag/save")
+ public R save(@RequestBody Tag tag) {
+ if (!tagService.save(tag)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:tag:update')")
+ @OperationLog("淇敼褰掔被绠＄悊")
+ @PostMapping("/tag/update")
+ public R update(@RequestBody Tag tag) {
+ if (!tagService.updateById(tag)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:tag:remove')")
+ @OperationLog("鍒犻櫎褰掔被绠＄悊")
+ @PostMapping("/tag/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!tagService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:tag:list')")
+ @PostMapping("/tag/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<Tag> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(Tag::getName, condition);
+ }
+ tagService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:tag:list')")
+ @PostMapping("/tag/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(tagService.list(), Tag.class), response);
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Tag.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Tag.java
new file mode 100644
index 0000000..c4f5f40
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Tag.java
@@ -0,0 +1,282 @@
+package com.zy.asrs.wms.asrs.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.zy.asrs.wms.system.entity.Host;
+import com.zy.asrs.wms.system.entity.User;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wms.system.service.UserService;
+import com.zy.asrs.wms.system.service.HostService;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@TableName("man_tag")
+public class Tag implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ private String uuid;
+
+ /**
+ * 鍚嶇О
+ */
+ @ApiModelProperty(value= "鍚嶇О")
+ private String name;
+
+ /**
+ * 鏍囪瘑
+ */
+ @ApiModelProperty(value= "鏍囪瘑")
+ private String flag;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ /**
+ * 鐖剁骇
+ */
+ @ApiModelProperty(value= "鐖剁骇")
+ private Long parentId;
+
+ /**
+ * 鐖剁骇鍚嶇О
+ */
+ @ApiModelProperty(value= "鐖剁骇鍚嶇О")
+ private String parentName;
+
+ /**
+ * 鍏宠仈璺緞
+ */
+ @ApiModelProperty(value= "鍏宠仈璺緞")
+ private String path;
+
+ /**
+ * 鍏宠仈璺緞鍚�
+ */
+ @ApiModelProperty(value= "鍏宠仈璺緞鍚�")
+ private String pathName;
+
+ /**
+ * 绫诲瀷 0: 鍏朵粬
+ */
+ @ApiModelProperty(value= "绫诲瀷 0: 鍏朵粬 ")
+ private Integer type;
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty(value= "鏁伴噺")
+ private Integer count;
+
+ /**
+ * 绛夌骇
+ */
+ @ApiModelProperty(value= "绛夌骇")
+ private Integer level;
+
+ /**
+ * 鎺掑簭
+ */
+ @ApiModelProperty(value= "鎺掑簭")
+ private Integer sort;
+
+ @TableField(exist = false)
+ private List<Tag> children;
+
+ public Tag() {}
+
+ public Tag(String uuid,String name,String flag,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,Long parentId,String parentName,String path,String pathName,Integer type,Integer count,Integer level,Integer sort) {
+ this.uuid = uuid;
+ this.name = name;
+ this.flag = flag;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ this.parentId = parentId;
+ this.parentName = parentName;
+ this.path = path;
+ this.pathName = pathName;
+ this.type = type;
+ this.count = count;
+ this.level = level;
+ this.sort = sort;
+ }
+
+// Tag tag = new Tag(
+// null, // 缂栧彿
+// null, // 鍚嶇О
+// null, // 鏍囪瘑
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 澶囨敞
+// null, // 鐖剁骇
+// null, // 鐖剁骇鍚嶇О
+// null, // 鍏宠仈璺緞
+// null, // 鍏宠仈璺緞鍚�
+// null, // 绫诲瀷
+// null, // 鏁伴噺
+// null, // 绛夌骇
+// null // 鎺掑簭
+// );
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getDeleted$(){
+ if (null == this.deleted){ return null; }
+ switch (this.deleted){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.deleted);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getType$(){
+ if (null == this.type){ return null; }
+ switch (this.type){
+ case 0:
+ return "鍏朵粬";
+ default:
+ return String.valueOf(this.type);
+ }
+ }
+
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TagMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TagMapper.java
new file mode 100644
index 0000000..95dbd90
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TagMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.asrs.mapper;
+
+import com.zy.asrs.wms.asrs.entity.Tag;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface TagMapper extends BaseMapper<Tag> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TagService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TagService.java
new file mode 100644
index 0000000..59f87b1
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TagService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.wms.asrs.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wms.asrs.entity.Tag;
+
+public interface TagService extends IService<Tag> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TagServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TagServiceImpl.java
new file mode 100644
index 0000000..ce5815e
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TagServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.asrs.service.impl;
+
+import com.zy.asrs.wms.asrs.mapper.TagMapper;
+import com.zy.asrs.wms.asrs.entity.Tag;
+import com.zy.asrs.wms.asrs.service.TagService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("tagService")
+public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements TagService {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java
index 2a04143..8474230 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java
@@ -147,7 +147,6 @@
List<Menu> menuList = menuService.list(new LambdaQueryWrapper<Menu>()
.in(Menu::getId, menus)
.eq(Menu::getType, Menu.TYPE_MENU)
- .eq(Menu::getPath, 1)
.orderByAsc(Menu::getId));
return R.ok().add(menuList);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
index c954a9a..c377e10 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
@@ -22,9 +22,9 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="sys_dict";
- generator.tableName="瀛楀吀绠＄悊";
- generator.packagePath="com.zy.asrs.wms.system";
+ generator.table="man_tag";
+ generator.tableName="褰掔被绠＄悊";
+ generator.packagePath="com.zy.asrs.wms.asrs";
generator.build();
}
diff --git a/zy-asrs-wms/src/main/java/dict.sql b/zy-asrs-wms/src/main/java/dict.sql
deleted file mode 100644
index ce5d73e..0000000
--- a/zy-asrs-wms/src/main/java/dict.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- save dict record
--- mysql
-insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '瀛楀吀绠＄悊绠＄悊', '0', '/system/dict', '/system/dict', '0' , '0', '1' , '1');
-
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ瀛楀吀', '', '1', 'system:dict:list', '0', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞瀛楀吀', '', '1', 'system:dict:save', '1', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼瀛楀吀', '', '1', 'system:dict:update', '2', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎瀛楀吀', '', '1', 'system:dict:remove', '3', '1', '1');
-
diff --git a/zy-asrs-wms/src/main/java/tag.sql b/zy-asrs-wms/src/main/java/tag.sql
new file mode 100644
index 0000000..3b34cb6
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/tag.sql
@@ -0,0 +1,9 @@
+-- save tag record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '褰掔被绠＄悊绠＄悊', '0', '/asrs/tag', '/asrs/tag', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ褰掔被绠＄悊', '', '1', 'asrs:tag:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞褰掔被绠＄悊', '', '1', 'asrs:tag:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼褰掔被绠＄悊', '', '1', 'asrs:tag:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎褰掔被绠＄悊', '', '1', 'asrs:tag:remove', '3', '1', '1');
+
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/TagMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/TagMapper.xml
new file mode 100644
index 0000000..ec956fa
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/TagMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.wms.asrs.mapper.TagMapper">
+
+</mapper>
--
Gitblit v1.9.1