#

Junjie

2024-07-12 61e58f3a3167be911436e69fe1728de607b3589c

#

 zy-asrs-admin/src/assets/main.css

@@ -6,7 +6,7 @@
}

.trigger {
  font-size: 16px;
  font-size: 14px;
  line-height: 64px;
  padding: 0 6px;
  cursor: pointer;
@@ -55,7 +55,7 @@
  flex: 4;
  display: flex;
  justify-content: flex-end;
  font-size: 16px;
  font-size: 14px;
}

.header-top-right>div {

 zy-asrs-admin/src/config.js

@@ -13,7 +13,8 @@
        'enUS': {
            desc: 'English'
        }
    }
    },
    localeData: {}
});

export const logout = () => {

 zy-asrs-admin/src/main.js

@@ -8,6 +8,7 @@
import { initRouter } from '@/router/index.js'
import { globalState } from './config.js'
import print from 'vue3-print-nb'
import { loadData } from '@/utils/localeUtils.js'

const app = createApp(App)

@@ -21,6 +22,8 @@
        if(locale != null) {
            globalState.locale = locale;
        }

        loadData(globalState.locale)
    }
}


 zy-asrs-admin/src/utils/localeUtils.js

@@ -1,14 +1,8 @@
import { globalState } from '../config.js'
import enUS from '../locales/en_US.js';
import zhCN from '../locales/zh_CN.js';
import { post } from '@/utils/request.js'

export const formatMessage = (id, defaultMessage) => {
    const localesType = {
        enUS,
        zhCN,
    }

    const message = localesType[globalState.locale]
    const message = globalState.localeData;
    if(message == null) {
        return defaultMessage;
    }
@@ -16,4 +10,12 @@
        return defaultMessage;
    }
    return message[id];
}

export const loadData = async (locale) => {
    let resp = await post('/api/language/json',{
        locale: locale
    })
    let result = resp.data;
    globalState.localeData = result.data;
}

 zy-asrs-admin/src/views/IndexView.vue

@@ -15,7 +15,7 @@
  TranslationOutlined,
  ApartmentOutlined,
} from "@ant-design/icons-vue";
import { formatMessage } from '@/utils/localeUtils.js';
import { formatMessage, loadData } from '@/utils/localeUtils.js';

const globalState = inject('globalState');
const selectedKeys = ref([]);
@@ -145,9 +145,10 @@
  selectedKeys.value = [item.key]
}

const switchLocale = (locale) => {
const switchLocale = async (locale) => {
  globalState.locale = locale;
  localStorage.setItem('locale', locale)
  loadData(locale);
  reloadTabs()
}


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

New file
@@ -0,0 +1,108 @@
<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);

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/language/save' : '/api/language/update', formData.value).then((resp) => {
        let result = resp.data;
        if (result.code === 200) {
            message.success(isSave.value ? formatMessage('page.add.success', '新增成功') : formatMessage('page.update.success', '更新成功'));
        } else {
            message.error(result.msg);
        }
        emit('tableReload', 'reload')
        nextTick(() => {
            formTable.value.resetFields()
        })
    })
};
const onFinishFailed = errorInfo => {
    console.log('Failed:', errorInfo);
};



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" 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.sys_language.name', '名称')" name="name" style="width: 250px;"
                    :rules="[{ required: true }]">
                    <a-input v-model:value="formData.name" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.sys_language.language_id', '国际化ID')" name="languageId"
                    style="width: 250px;">
                    <a-input v-model:value="formData.languageId" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.sys_language.locale', '地区')" name="locale"
                    style="width: 250px;">
                    <a-select v-model:value="formData.locale" :options="[
                        { label: '简体中文', value: 'zhCN' },
                        { label: 'English', value: 'enUS' },
                    ]">
                    </a-select>
                </a-form-item>
                <a-form-item :label="formatMessage('db.sys_language.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_language.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_language.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/language/index.vue

New file
@@ -0,0 +1,196 @@
<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-language';
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
const editChild = ref(null)

let tableData = ref([]);
getPage();

const columns = [
  {
    title: formatMessage('db.sys_language.name', '名称'),
    dataIndex: 'name',
    width: 140,
    ellipsis: true,
  },
  {
    title: formatMessage('db.sys_language.language_id', '国际化ID'),
    dataIndex: 'languageId',
    width: 140,
    ellipsis: true,
  },
  {
    title: formatMessage('db.sys_language.locale', '地区'),
    dataIndex: 'locale',
    width: 140,
    ellipsis: true,
  },
  {
    title: formatMessage('db.sys_language.create_time', '添加时间'),
    dataIndex: 'createTime$',
    width: 140,
    ellipsis: true,
  },
  {
    title: formatMessage('db.sys_language.update_time', '修改时间'),
    dataIndex: 'updateTime$',
    width: 140,
    ellipsis: true,
  },
  {
    title: formatMessage('db.sys_language.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/language/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/language/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/language/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-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java

@@ -49,6 +49,7 @@
                        "sys_host",
                        "sys_user_role",
                        "sys_role_menu",
                        "sys_language",
                        "view_man_loc_detl_field"
                ).contains(tableName);
            }

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

New file
@@ -0,0 +1,114 @@
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.Language;
import com.zy.asrs.wms.system.service.LanguageService;
import com.zy.asrs.wms.system.controller.BaseController;
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.*;

@RestController
@RequestMapping("/api")
public class LanguageController extends BaseController {

    @Autowired
    private LanguageService languageService;

    @PreAuthorize("hasAuthority('system:language:list')")
    @PostMapping("/language/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Language, BaseParam> pageParam = new PageParam<>(baseParam, Language.class);
        return R.ok().add(languageService.page(pageParam, pageParam.buildWrapper(true)));
    }

    @PreAuthorize("hasAuthority('system:language:list')")
    @PostMapping("/language/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(languageService.list());
    }

    @PreAuthorize("hasAuthority('system:language:list')")
    @PostMapping("/language/json")
    public R json(@RequestBody Map<String, Object> map) {
        LambdaQueryWrapper<Language> wrapper = new LambdaQueryWrapper<>();
        if(map.containsKey("locale")){
            wrapper.eq(Language::getLocale, map.get("locale"));
        }
        List<Language> list = languageService.list(wrapper);
        HashMap<String, String> data = new HashMap<>();
        for (Language language : list) {
            data.put(language.getLanguageId(), language.getName());
        }
        return R.ok().add(data);
    }

    @PreAuthorize("hasAuthority('system:language:list')")
    @GetMapping("/language/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(languageService.getById(id));
    }

    @PreAuthorize("hasAuthority('system:language:save')")
    @OperationLog("添加国际化配置")
    @PostMapping("/language/save")
    public R save(@RequestBody Language language) {
        if (!languageService.save(language)) {
            return R.error("添加失败");
        }
        return R.ok("添加成功");
    }

    @PreAuthorize("hasAuthority('system:language:update')")
    @OperationLog("修改国际化配置")
    @PostMapping("/language/update")
    public R update(@RequestBody Language language) {
        if (!languageService.updateById(language)) {
            return R.error("修改失败");
        }
        return R.ok("修改成功");
    }

    @PreAuthorize("hasAuthority('system:language:remove')")
    @OperationLog("删除国际化配置")
    @PostMapping("/language/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!languageService.removeByIds(Arrays.asList(ids))) {
            return R.error("删除失败");
        }
        return R.ok("删除成功");
    }

    @PreAuthorize("hasAuthority('system:language:list')")
    @PostMapping("/language/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<Language> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(Language::getName, condition);
        }
        languageService.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:language:list')")
    @PostMapping("/language/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(languageService.list(), Language.class), response);
    }

}

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

New file
@@ -0,0 +1,110 @@
package com.zy.asrs.wms.system.entity;

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_language")
public class Language 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 name;

    /**
     * 国际化ID
     */
    @ApiModelProperty(value= "国际化ID")
    private String languageId;

    /**
     * 地区
     */
    @ApiModelProperty(value= "地区")
    private String locale;

    /**
     * 添加时间
     */
    @ApiModelProperty(value= "添加时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**
     * 修改时间
     */
    @ApiModelProperty(value= "修改时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;

    public Language() {}

    public Language(String name,String languageId,String locale,Date createTime,Date updateTime,String memo) {
        this.name = name;
        this.languageId = languageId;
        this.locale = locale;
        this.createTime = createTime;
        this.updateTime = updateTime;
        this.memo = memo;
    }

//    Language language = new Language(
//            null,    // 名称[非空]
//            null,    // 国际化ID
//            null,    // 地区
//            null,    // 添加时间
//            null,    // 修改时间
//            null    // 备注
//    );

    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }

    public String getUpdateTime$(){
        if (Cools.isEmpty(this.updateTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }


}

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

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.system.mapper;

import com.zy.asrs.wms.system.entity.Language;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface LanguageMapper extends BaseMapper<Language> {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/LanguageService.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.Language;

public interface LanguageService extends IService<Language> {

}

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

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.system.service.impl;

import com.zy.asrs.wms.system.mapper.LanguageMapper;
import com.zy.asrs.wms.system.entity.Language;
import com.zy.asrs.wms.system.service.LanguageService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("languageService")
public class LanguageServiceImpl extends ServiceImpl<LanguageMapper, Language> implements LanguageService {

}

 zy-asrs-wms/src/main/resources/mapper/system/LanguageMapper.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.LanguageMapper">

</mapper>