#

Junjie

2024-07-03 61aff1004217820d8e73dce859fcdf7cc20d5d40

#

 zy-asrs-admin/src/views/system/dict/edit.vue

New file
@@ -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>

 zy-asrs-admin/src/views/system/dict/index.vue

New file
@@ -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>

 zy-asrs-admin/src/views/system/host/index.vue

@@ -144,6 +144,7 @@

function handleTableReload(value) {
  getPage()
  window.location.reload();
}

</script>

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/DictController.java

New file
@@ -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);
    }

}

 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());
            }
        }


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Dict.java

New file
@@ -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;
    }


}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/DictMapper.java

New file
@@ -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> {

}

 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);

}

 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);

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/DictService.java

New file
@@ -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> {

}

 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);

}

 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);

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/DictServiceImpl.java

New file
@@ -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 {

}

 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);
    }
}

 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);
    }
}

 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();

 zy-asrs-wms/src/main/java/dict.sql

New file
@@ -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');


 zy-asrs-wms/src/main/java/user.sql

File was deleted

 zy-asrs-wms/src/main/resources/mapper/system/DictMapper.xml

New file
@@ -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>

 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>

 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.*