From 61e58f3a3167be911436e69fe1728de607b3589c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 12 七月 2024 14:17:55 +0800
Subject: [PATCH] #

---
 zy-asrs-admin/src/main.js                                                              |    3 
 zy-asrs-admin/src/views/system/language/edit.vue                                       |  108 ++++++++++
 zy-asrs-admin/src/utils/localeUtils.js                                                 |   18 +
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Language.java                  |  110 +++++++++++
 zy-asrs-admin/src/assets/main.css                                                      |    4 
 zy-asrs-admin/src/config.js                                                            |    3 
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/LanguageMapper.java            |   12 +
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/LanguageServiceImpl.java |   12 +
 zy-asrs-admin/src/views/system/language/index.vue                                      |  196 +++++++++++++++++++
 zy-asrs-admin/src/views/IndexView.vue                                                  |    5 
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java         |    1 
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/LanguageService.java          |    8 
 zy-asrs-wms/src/main/resources/mapper/system/LanguageMapper.xml                        |    5 
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/LanguageController.java    |  114 +++++++++++
 14 files changed, 586 insertions(+), 13 deletions(-)

diff --git a/zy-asrs-admin/src/assets/main.css b/zy-asrs-admin/src/assets/main.css
index 7b01d7b..ceb4845 100644
--- a/zy-asrs-admin/src/assets/main.css
+++ b/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 {
diff --git a/zy-asrs-admin/src/config.js b/zy-asrs-admin/src/config.js
index 80c3f66..791414c 100644
--- a/zy-asrs-admin/src/config.js
+++ b/zy-asrs-admin/src/config.js
@@ -13,7 +13,8 @@
         'enUS': {
             desc: 'English'
         }
-    }
+    },
+    localeData: {}
 });
 
 export const logout = () => {
diff --git a/zy-asrs-admin/src/main.js b/zy-asrs-admin/src/main.js
index 35e814f..b3dc4d2 100644
--- a/zy-asrs-admin/src/main.js
+++ b/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)
     }
 }
 
diff --git a/zy-asrs-admin/src/utils/localeUtils.js b/zy-asrs-admin/src/utils/localeUtils.js
index c503c68..fd4236c 100644
--- a/zy-asrs-admin/src/utils/localeUtils.js
+++ b/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;
 }
\ No newline at end of file
diff --git a/zy-asrs-admin/src/views/IndexView.vue b/zy-asrs-admin/src/views/IndexView.vue
index f2eebe0..cdde2ce 100644
--- a/zy-asrs-admin/src/views/IndexView.vue
+++ b/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()
 }
 
diff --git a/zy-asrs-admin/src/views/system/language/edit.vue b/zy-asrs-admin/src/views/system/language/edit.vue
new file mode 100644
index 0000000..2c8c266
--- /dev/null
+++ b/zy-asrs-admin/src/views/system/language/edit.vue
@@ -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', '鍥介檯鍖朓D')" 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>
diff --git a/zy-asrs-admin/src/views/system/language/index.vue b/zy-asrs-admin/src/views/system/language/index.vue
new file mode 100644
index 0000000..f16883d
--- /dev/null
+++ b/zy-asrs-admin/src/views/system/language/index.vue
@@ -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', '鍥介檯鍖朓D'),
+    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>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java
index 4208482..652e886 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java
+++ b/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);
             }
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/LanguageController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/LanguageController.java
new file mode 100644
index 0000000..45b6832
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/LanguageController.java
@@ -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);
+    }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Language.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Language.java
new file mode 100644
index 0000000..bc284d5
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Language.java
@@ -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;
+
+    /**
+     * 鍥介檯鍖朓D
+     */
+    @ApiModelProperty(value= "鍥介檯鍖朓D")
+    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,    // 鍥介檯鍖朓D
+//            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);
+    }
+
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/LanguageMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/LanguageMapper.java
new file mode 100644
index 0000000..cc9b2a6
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/LanguageMapper.java
@@ -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> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/LanguageService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/LanguageService.java
new file mode 100644
index 0000000..b49a6d4
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/LanguageService.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.Language;
+
+public interface LanguageService extends IService<Language> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/LanguageServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/LanguageServiceImpl.java
new file mode 100644
index 0000000..904bd7c
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/LanguageServiceImpl.java
@@ -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 {
+
+}
diff --git a/zy-asrs-wms/src/main/resources/mapper/system/LanguageMapper.xml b/zy-asrs-wms/src/main/resources/mapper/system/LanguageMapper.xml
new file mode 100644
index 0000000..0be0df7
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/mapper/system/LanguageMapper.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.LanguageMapper">
+
+</mapper>

--
Gitblit v1.9.1