From 61aff1004217820d8e73dce859fcdf7cc20d5d40 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 03 七月 2024 17:08:07 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/DictMapper.java | 12
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java | 4
zy-asrs-wms/src/main/resources/mapper/system/RoleMapper.xml | 5
zy-asrs-wms/src/main/resources/mapper/system/DictMapper.xml | 5
zy-asrs-admin/src/views/system/dict/index.vue | 232 ++++++++++++++
zy-asrs-wms/src/main/resources/mapper/system/UserMapper.xml | 5
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/HostController.java | 11
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/DictController.java | 101 ++++++
zy-asrs-admin/src/views/system/dict/edit.vue | 224 ++++++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/UserService.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/DictServiceImpl.java | 12
/dev/null | 9
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/DictService.java | 8
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Dict.java | 245 +++++++++++++++
zy-asrs-wms/src/main/java/dict.sql | 9
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/RoleService.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/RoleServiceImpl.java | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/UserMapper.java | 3
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/RoleMapper.java | 4
zy-asrs-admin/src/views/system/host/index.vue | 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/UserServiceImpl.java | 5
21 files changed, 889 insertions(+), 14 deletions(-)
diff --git a/zy-asrs-admin/src/views/system/dict/edit.vue b/zy-asrs-admin/src/views/system/dict/edit.vue
new file mode 100644
index 0000000..964a1d8
--- /dev/null
+++ b/zy-asrs-admin/src/views/system/dict/edit.vue
@@ -0,0 +1,224 @@
+<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 submitButton = ref(null);
+const isSave = ref(true);
+const open = ref(false);
+const initFormData = {}
+let formData = ref(initFormData);
+
+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/dict/save' : '/api/dict/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')
+ })
+};
+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,
+})
+
+</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" 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.sys_dict.uuid', '缂栧彿') "
+ name="uuid"
+ style="width: 250px;"
+ >
+ <a-input
+ v-model:value="formData.uuid"
+ />
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.sys_dict.name', '瀛楀吀鍚嶇О') "
+ name="name"
+ style="width: 250px;"
+ >
+ <a-input
+ v-model:value="formData.name"
+ />
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.sys_dict.type', '绫诲瀷') "
+ name="type"
+ style="width: 250px;"
+ >
+ <a-select
+ v-model:value="formData.type"
+ :options="[
+ { label: '甯冨皵鍊�', value: 1 },
+ { label: '鏁板瓧', value: 2 },
+ { label: '鏂囨湰', value: 3 },
+ { label: 'JSON', value: 4 },
+ { label: '鍥剧墖', value: 5 },
+ ]"
+ >
+ </a-select>
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.sys_dict.flag', '鏍囪瘑') "
+ name="flag"
+ style="width: 250px;"
+ >
+ <a-input
+ v-model:value="formData.flag"
+ />
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.sys_dict.value', '瀛楀吀鍊�') "
+ name="value"
+ style="width: 250px;"
+ >
+ <a-input
+ v-model:value="formData.value"
+ />
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.sys_dict.sort', '鎺掑簭') "
+ name="sort"
+ style="width: 250px;"
+ >
+ <a-input
+ v-model:value="formData.sort"
+ />
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.sys_dict.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.sys_dict.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.sys_dict.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.sys_dict.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.sys_dict.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.sys_dict.memo', '澶囨敞') "
+ name="memo"
+ style="width: 250px;"
+ >
+ <a-input
+ v-model:value="formData.memo"
+ />
+ </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/system/dict/index.vue b/zy-asrs-admin/src/views/system/dict/index.vue
new file mode 100644
index 0000000..26a3068
--- /dev/null
+++ b/zy-asrs-admin/src/views/system/dict/index.vue
@@ -0,0 +1,232 @@
+<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-dict';
+let currentPage = 1;
+let pageSize = 10;
+const searchInput = ref("")
+const editChild = ref(null)
+
+let tableData = ref([]);
+getPage();
+
+const columns = [
+ {
+ title: formatMessage('db.sys_dict.uuid', '缂栧彿'),
+ dataIndex: 'uuid',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.sys_dict.name', '瀛楀吀鍚嶇О'),
+ dataIndex: 'name',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.sys_dict.type', '绫诲瀷'),
+ dataIndex: 'type$',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.sys_dict.flag', '鏍囪瘑'),
+ dataIndex: 'flag',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.sys_dict.value', '瀛楀吀鍊�'),
+ dataIndex: 'value',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.sys_dict.sort', '鎺掑簭'),
+ dataIndex: 'sort',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.sys_dict.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.sys_dict.create_time', '娣诲姞鏃堕棿'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.sys_dict.create_by', '娣诲姞浜哄憳'),
+ dataIndex: 'createBy$',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.sys_dict.update_time', '淇敼鏃堕棿'),
+ dataIndex: 'updateTime$',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.sys_dict.update_by', '淇敼浜哄憳'),
+ dataIndex: 'updateBy$',
+ width: 140,
+ ellipsis: true,
+ },
+ {
+ title: formatMessage('db.sys_dict.memo', '澶囨敞'),
+ dataIndex: 'memo',
+ 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/dict/page', {
+ current: currentPage,
+ pageSize: pageSize,
+ condition: searchInput.value
+ }).then((resp) => {
+ let result = resp.data;
+ if (result.code == 200) {
+ let data = result.data;
+ tableData.value = 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/dict/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/dict/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.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
+ :pagination="{ total: tableData.total, onChange: onPageChange }"
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns">
+ <template #bodyCell="{ column, text, record }">
+ <template v-if="column.dataIndex === 'oper'">
+ <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>
+ </template>
+ </a-table>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-admin/src/views/system/host/index.vue b/zy-asrs-admin/src/views/system/host/index.vue
index 034d9ad..d653ffd 100644
--- a/zy-asrs-admin/src/views/system/host/index.vue
+++ b/zy-asrs-admin/src/views/system/host/index.vue
@@ -144,6 +144,7 @@
function handleTableReload(value) {
getPage()
+ window.location.reload();
}
</script>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/DictController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/DictController.java
new file mode 100644
index 0000000..24282cf
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/DictController.java
@@ -0,0 +1,101 @@
+package com.zy.asrs.wms.system.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.system.entity.Dict;
+import com.zy.asrs.wms.system.service.DictService;
+import com.zy.asrs.wms.utils.ExcelUtil;
+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 DictController extends BaseController {
+
+ @Autowired
+ private DictService dictService;
+
+ @PreAuthorize("hasAuthority('system:dict:list')")
+ @PostMapping("/dict/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Dict, BaseParam> pageParam = new PageParam<>(baseParam, Dict.class);
+ return R.ok().add(dictService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('system:dict:list')")
+ @PostMapping("/dict/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(dictService.list());
+ }
+
+ @PreAuthorize("hasAuthority('system:dict:list')")
+ @GetMapping("/dict/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(dictService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('system:dict:save')")
+ @OperationLog("娣诲姞瀛楀吀绠＄悊")
+ @PostMapping("/dict/save")
+ public R save(@RequestBody Dict dict) {
+ if (!dictService.save(dict)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('system:dict:update')")
+ @OperationLog("淇敼瀛楀吀绠＄悊")
+ @PostMapping("/dict/update")
+ public R update(@RequestBody Dict dict) {
+ if (!dictService.updateById(dict)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('system:dict:remove')")
+ @OperationLog("鍒犻櫎瀛楀吀绠＄悊")
+ @PostMapping("/dict/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!dictService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('system:dict:list')")
+ @PostMapping("/dict/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<Dict> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(Dict::getName, condition);
+ }
+ dictService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('system:dict:list')")
+ @PostMapping("/dict/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(dictService.list(), Dict.class), response);
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/HostController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/HostController.java
index e6e9444..865fde5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/HostController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/HostController.java
@@ -12,9 +12,7 @@
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.Menu;
import com.zy.asrs.wms.system.entity.RoleMenu;
-import com.zy.asrs.wms.system.service.HostService;
-import com.zy.asrs.wms.system.service.MenuService;
-import com.zy.asrs.wms.system.service.RoleMenuService;
+import com.zy.asrs.wms.system.service.*;
import com.zy.asrs.wms.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -34,6 +32,10 @@
private MenuService menuService;
@Autowired
private RoleMenuService roleMenuService;
+ @Autowired
+ private RoleService roleService;
+ @Autowired
+ private UserService userService;
@PreAuthorize("hasAuthority('system:host:list')")
@PostMapping("/host/page")
@@ -160,6 +162,9 @@
if (!result1) {
throw new CoolException("鍒犻櫎澶辫触");
}
+
+ roleService.removeByHostId(host.getId());
+ userService.removeByHostId(host.getId());
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Dict.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Dict.java
new file mode 100644
index 0000000..daba43e
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Dict.java
@@ -0,0 +1,245 @@
+package com.zy.asrs.wms.system.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+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;
+
+@Data
+@TableName("sys_dict")
+public class Dict 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;
+
+ /**
+ * 绫诲瀷 1: 甯冨皵鍊� 2: 鏁板瓧 3: 鏂囨湰 4: JSON 5: 鍥剧墖
+ */
+ @ApiModelProperty(value= "绫诲瀷 1: 甯冨皵鍊� 2: 鏁板瓧 3: 鏂囨湰 4: JSON 5: 鍥剧墖 ")
+ private Integer type;
+
+ /**
+ * 鏍囪瘑
+ */
+ @ApiModelProperty(value= "鏍囪瘑")
+ private String flag;
+
+ /**
+ * 瀛楀吀鍊�
+ */
+ @ApiModelProperty(value= "瀛楀吀鍊�")
+ private String value;
+
+ /**
+ * 鎺掑簭
+ */
+ @ApiModelProperty(value= "鎺掑簭")
+ private Integer sort;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @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;
+
+ public Dict() {}
+
+ public Dict(String uuid,String name,Integer type,String flag,String value,Integer sort,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ this.uuid = uuid;
+ this.name = name;
+ this.type = type;
+ this.flag = flag;
+ this.value = value;
+ this.sort = sort;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// Dict dict = new Dict(
+// null, // 缂栧彿
+// null, // 瀛楀吀鍚嶇О
+// null, // 绫诲瀷
+// null, // 鏍囪瘑
+// null, // 瀛楀吀鍊�
+// null, // 鎺掑簭
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public String getType$(){
+ if (null == this.type){ return null; }
+ switch (this.type){
+ case 1:
+ return "甯冨皵鍊�";
+ case 2:
+ return "鏁板瓧";
+ case 3:
+ return "鏂囨湰";
+ case 4:
+ return "JSON";
+ case 5:
+ return "鍥剧墖";
+ default:
+ return String.valueOf(this.type);
+ }
+ }
+
+ 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;
+ }
+
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/DictMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/DictMapper.java
new file mode 100644
index 0000000..cf894e0
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/DictMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.system.mapper;
+
+import com.zy.asrs.wms.system.entity.Dict;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface DictMapper extends BaseMapper<Dict> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/RoleMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/RoleMapper.java
index 0ad24f5..325e331 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/RoleMapper.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/RoleMapper.java
@@ -1,5 +1,6 @@
package com.zy.asrs.wms.system.mapper;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.zy.asrs.wms.system.entity.Role;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -9,4 +10,7 @@
@Repository
public interface RoleMapper extends BaseMapper<Role> {
+ @InterceptorIgnore(tenantLine = "true")
+ int removeByHostId(Long hostId);
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/UserMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/UserMapper.java
index c1a46c8..5f3a82a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/UserMapper.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/UserMapper.java
@@ -23,4 +23,7 @@
@InterceptorIgnore(tenantLine = "true")
User superGetById(@Param("id") Long id);
+ @InterceptorIgnore(tenantLine = "true")
+ int removeByHostId(Long hostId);
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/DictService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/DictService.java
new file mode 100644
index 0000000..f612a0c
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/DictService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.wms.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wms.system.entity.Dict;
+
+public interface DictService extends IService<Dict> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/RoleService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/RoleService.java
index e1aab4d..42652d2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/RoleService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/RoleService.java
@@ -5,4 +5,6 @@
public interface RoleService extends IService<Role> {
+ int removeByHostId(Long hostId);
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/UserService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/UserService.java
index 25bfc7f..c52413e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/UserService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/UserService.java
@@ -20,4 +20,6 @@
User superGetById(Long id);
+ int removeByHostId(Long hostId);
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/DictServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/DictServiceImpl.java
new file mode 100644
index 0000000..ff1a4a5
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/DictServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.system.service.impl;
+
+import com.zy.asrs.wms.system.mapper.DictMapper;
+import com.zy.asrs.wms.system.entity.Dict;
+import com.zy.asrs.wms.system.service.DictService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("dictService")
+public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements DictService {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/RoleServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/RoleServiceImpl.java
index 7513306..cfead08 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/RoleServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/RoleServiceImpl.java
@@ -9,4 +9,8 @@
@Service("roleService")
public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
+ @Override
+ public int removeByHostId(Long hostId) {
+ return this.baseMapper.removeByHostId(hostId);
+ }
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/UserServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/UserServiceImpl.java
index 4a87d4f..f1d69ee 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/UserServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/UserServiceImpl.java
@@ -67,4 +67,9 @@
public User superGetById(Long id) {
return this.baseMapper.superGetById(id);
}
+
+ @Override
+ public int removeByHostId(Long hostId) {
+ return this.baseMapper.removeByHostId(hostId);
+ }
}
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 f956da6..c954a9a 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,8 +22,8 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="sys_user";
- generator.tableName="鐢ㄦ埛绠＄悊";
+ generator.table="sys_dict";
+ generator.tableName="瀛楀吀绠＄悊";
generator.packagePath="com.zy.asrs.wms.system";
generator.build();
diff --git a/zy-asrs-wms/src/main/java/dict.sql b/zy-asrs-wms/src/main/java/dict.sql
new file mode 100644
index 0000000..ce5d73e
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/dict.sql
@@ -0,0 +1,9 @@
+-- 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/user.sql b/zy-asrs-wms/src/main/java/user.sql
deleted file mode 100644
index a704325..0000000
--- a/zy-asrs-wms/src/main/java/user.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- save user record
--- mysql
-insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '鐢ㄦ埛绠＄悊绠＄悊', '0', '/system/user', '/system/user', '0' , '0', '1' , '1');
-
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ鐢ㄦ埛绠＄悊', '', '1', 'system:user:list', '0', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞鐢ㄦ埛绠＄悊', '', '1', 'system:user:save', '1', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼鐢ㄦ埛绠＄悊', '', '1', 'system:user:update', '2', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎鐢ㄦ埛绠＄悊', '', '1', 'system:user:remove', '3', '1', '1');
-
diff --git a/zy-asrs-wms/src/main/resources/mapper/system/DictMapper.xml b/zy-asrs-wms/src/main/resources/mapper/system/DictMapper.xml
new file mode 100644
index 0000000..570d59e
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/mapper/system/DictMapper.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.system.mapper.DictMapper">
+
+</mapper>
diff --git a/zy-asrs-wms/src/main/resources/mapper/system/RoleMapper.xml b/zy-asrs-wms/src/main/resources/mapper/system/RoleMapper.xml
index d22d633..4ad545f 100644
--- a/zy-asrs-wms/src/main/resources/mapper/system/RoleMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/system/RoleMapper.xml
@@ -2,4 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.wms.system.mapper.RoleMapper">
+ <delete id="removeByHostId">
+ delete from sys_role
+ where host_id = #{hostId}
+ </delete>
+
</mapper>
diff --git a/zy-asrs-wms/src/main/resources/mapper/system/UserMapper.xml b/zy-asrs-wms/src/main/resources/mapper/system/UserMapper.xml
index 4857baa..5a9c673 100644
--- a/zy-asrs-wms/src/main/resources/mapper/system/UserMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/system/UserMapper.xml
@@ -20,6 +20,11 @@
and id = #{id}
</select>
+ <delete id="removeByHostId">
+ delete from sys_user
+ where host_id = #{hostId}
+ </delete>
+
<select id="selectPageRel" resultType="com.zy.asrs.wms.system.entity.User">
select
su.*
--
Gitblit v1.9.1