#

Junjie

2024-07-02 d4f427bf7c0ff1cf0ed1ac420bba8a063f9ef840

#

 zy-asrs-admin/src/locales/en_US.js

@@ -181,4 +181,23 @@
    'db.sys_dept.update_time':'UpdateTime',
    'db.sys_dept.update_by':'UpdateBy',
    'db.sys_dept.sort':'Sort',
    '':'',
    '':'',
    '':'',
    '':'',
    '':'',
    '':'',
    'db.sys_operation_record.namespace':'Namespace',
    'db.sys_operation_record.url':'Url',
    'db.sys_operation_record.appkey':'Appkey',
    'db.sys_operation_record.timestamp':'Timestamp',
    'db.sys_operation_record.client_ip':'ClientIp',
    'db.sys_operation_record.request':'Request',
    'db.sys_operation_record.response':'Response',
    'db.sys_operation_record.spend_time':'SpendTime',
    'db.sys_operation_record.err':'Err',
    'db.sys_operation_record.result':'Result',
    'db.sys_operation_record.user_id':'UserId',
    'db.sys_operation_record.create_time':'CreateTime',
    'db.sys_operation_record.memo':'Memo',
};

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

@@ -9,7 +9,6 @@
const open = ref(false);
const initFormData = {}
let formData = ref(initFormData);
const treeData = ref(null);

const emit = defineEmits(['tableReload'])

@@ -52,7 +51,6 @@
    open,
    formData,
    initFormData,
    treeData,
    isSave,
})

@@ -73,7 +71,7 @@
                style="display: flex;justify-content: space-between;flex-wrap: wrap;" autocomplete="off"
                @finish="onFinish" @finishFailed="onFinishFailed">
                    <a-form-item 
                      label="名称空间" 
                      :label="formatMessage('db.sys_operation_record.namespace', '名称空间') " 
                      name="namespace" 
                      style="width: 250px;" 
                            >
@@ -82,7 +80,7 @@
                     /> 
                        </a-form-item>
                    <a-form-item 
                      label="接口地址" 
                      :label="formatMessage('db.sys_operation_record.url', '接口地址') " 
                      name="url" 
                      style="width: 250px;" 
                            >
@@ -91,7 +89,7 @@
                     /> 
                        </a-form-item>
                    <a-form-item 
                      label="平台密钥" 
                      :label="formatMessage('db.sys_operation_record.appkey', '平台密钥') " 
                      name="appkey" 
                      style="width: 250px;" 
                            >
@@ -100,7 +98,7 @@
                     /> 
                        </a-form-item>
                    <a-form-item 
                      label="时间戳" 
                      :label="formatMessage('db.sys_operation_record.timestamp', '时间戳') " 
                      name="timestamp" 
                      style="width: 250px;" 
                            >
@@ -109,7 +107,7 @@
                     /> 
                        </a-form-item>
                    <a-form-item 
                      label="客户端IP" 
                      :label="formatMessage('db.sys_operation_record.client_ip', '客户端IP') " 
                      name="clientIp" 
                      style="width: 250px;" 
                            >
@@ -118,7 +116,7 @@
                     /> 
                        </a-form-item>
                    <a-form-item 
                      label="请求内容" 
                      :label="formatMessage('db.sys_operation_record.request', '请求内容') " 
                      name="request" 
                      style="width: 250px;" 
                            >
@@ -127,7 +125,7 @@
                     /> 
                        </a-form-item>
                    <a-form-item 
                      label="响应内容" 
                      :label="formatMessage('db.sys_operation_record.response', '响应内容') " 
                      name="response" 
                      style="width: 250px;" 
                            >
@@ -136,7 +134,7 @@
                     /> 
                        </a-form-item>
                    <a-form-item 
                      label="消耗时间" 
                      :label="formatMessage('db.sys_operation_record.spend_time', '消耗时间') " 
                      name="spendTime" 
                      style="width: 250px;" 
                            >
@@ -145,7 +143,7 @@
                     /> 
                        </a-form-item>
                    <a-form-item 
                      label="异常内容" 
                      :label="formatMessage('db.sys_operation_record.err', '异常内容') " 
                      name="err" 
                      style="width: 250px;" 
                            >
@@ -154,7 +152,7 @@
                     /> 
                        </a-form-item>
                    <a-form-item 
                      label="结果" 
                      :label="formatMessage('db.sys_operation_record.result', '结果') " 
                      name="result" 
                      style="width: 250px;" 
                            >
@@ -168,7 +166,7 @@
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      label="用户" 
                      :label="formatMessage('db.sys_operation_record.user_id', '用户') " 
                      name="userId" 
                      style="width: 250px;" 
                            >
@@ -184,7 +182,7 @@
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      label="添加时间" 
                      :label="formatMessage('db.sys_operation_record.create_time', '添加时间') " 
                      name="createTime" 
                      style="width: 250px;" 
                            >
@@ -196,7 +194,7 @@
                     /> 
                        </a-form-item>
                    <a-form-item 
                      label="备注" 
                      :label="formatMessage('db.sys_operation_record.memo', '备注') " 
                      name="memo" 
                      style="width: 250px;" 
                            >

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

@@ -24,26 +24,31 @@
            title: formatMessage('db.sys_operation_record.namespace', '名称空间'),
            dataIndex: 'namespace',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.sys_operation_record.url', '接口地址'),
            dataIndex: 'url',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.sys_operation_record.appkey', '平台密钥'),
            dataIndex: 'appkey',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.sys_operation_record.timestamp', '时间戳'),
            dataIndex: 'timestamp',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.sys_operation_record.client_ip', '客户端IP'),
            dataIndex: 'clientIp',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.sys_operation_record.request', '请求内容'),
@@ -61,31 +66,37 @@
            title: formatMessage('db.sys_operation_record.spend_time', '消耗时间'),
            dataIndex: 'spendTime',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.sys_operation_record.err', '异常内容'),
            dataIndex: 'err',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.sys_operation_record.result', '结果'),
            dataIndex: 'result$',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.sys_operation_record.user_id', '用户'),
            dataIndex: 'userId$',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.sys_operation_record.create_time', '添加时间'),
            dataIndex: 'createTime$',
            width: 140,
            ellipsis: true,
        },
        {
            title: formatMessage('db.sys_operation_record.memo', '备注'),
            dataIndex: 'memo',
            width: 140,
            ellipsis: true,
        },

  {

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

@@ -38,10 +38,10 @@
    console.log('Failed:', errorInfo);
};

const UserQueryList = ref(null); 
const UserQueryList = ref(null);
UserQuery();
function UserQuery() { 
    postForm('/api/user/query', {}).then(resp => { 
function UserQuery() {
    postForm('/api/user/query', {}).then(resp => {
        let result = resp.data;
        UserQueryList.value = result.data;
    })
@@ -72,87 +72,36 @@
            <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="用户" 
                      name="userId" 
                      style="width: 250px;" 
                            :rules="[{ required: true }]"
                            >
                    <a-select 
                        v-model:value="formData.userId" 
                        placeholder="Select users" 
                        style="width: 100%" 
                        show-search 
                        :options="UserQueryList" 
                        optionFilterProp="label" 
                        optionLabelProp="label" 
                     > 
                <a-form-item label="用户" name="userId" style="width: 250px;" :rules="[{ required: true }]">
                    <a-select v-model:value="formData.userId" placeholder="Select users" style="width: 100%" show-search
                        :options="UserQueryList" optionFilterProp="label" optionLabelProp="label">
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      label="密钥" 
                      name="token" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.token" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      label="登录ip" 
                      name="ip" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.ip" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      label="类型" 
                      name="type" 
                      style="width: 250px;" 
                            >
                    <a-select 
                        v-model:value="formData.type" 
                        :options="[
                                { label: '登录成功', value: 0 },
                                { label: '登录失败', value: 1 },
                                { label: '退出登录', value: 2 },
                                { label: '续签token', value: 3 },
                            ]"
                        >
                </a-form-item>
                <a-form-item label="密钥" name="token" style="width: 250px;">
                    <a-input v-model:value="formData.token" />
                </a-form-item>
                <a-form-item label="登录ip" name="ip" style="width: 250px;">
                    <a-input v-model:value="formData.ip" />
                </a-form-item>
                <a-form-item label="类型" name="type" style="width: 250px;">
                    <a-select v-model:value="formData.type" :options="[
                        { label: '登录成功', value: 0 },
                        { label: '登录失败', value: 1 },
                        { label: '退出登录', value: 2 },
                        { label: '续签token', value: 3 },
                    ]">
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      label="添加时间" 
                      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="登录系统" 
                      name="system" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.system" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      label="备注" 
                      name="memo" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.memo" 
                     /> 
                        </a-form-item>
                </a-form-item>
                <a-form-item label="添加时间" 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="登录系统" name="system" style="width: 250px;">
                    <a-input v-model:value="formData.system" />
                </a-form-item>
                <a-form-item label="备注" 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"

 zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java

@@ -788,7 +788,8 @@
                sb.append(column.getHumpName());
            }
            sb.append("',\n")
                    .append("            width: 140,\n");
                    .append("            width: 140,\n")
                    .append("            ellipsis: true,\n");
//            if (!Cools.isEmpty(column.getEnums())) {
//                sb.append("                customRender: (column) => {\n");
//                sb.append("                  let typeMap = {");
@@ -861,7 +862,7 @@
            }

            sb.append("                    <a-form-item \n");
            sb.append("                      label=\"").append(column.getComment()).append("\" \n");
            sb.append("                      :label=\"formatMessage('db.").append(table).append(".").append(column.getName()).append("', '").append(column.getComment()).append("') ").append("\" \n");
            sb.append("                      name=\"").append(column.getHumpName()).append("\" \n");
            sb.append("                      style=\"width: 250px;\" \n");


 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_dept";
        generator.tableName="部门管理";
        generator.table="sys_operation_record";
        generator.tableName="操作日志";
        generator.packagePath="com.zy.asrs.wms.system";

        generator.build();

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

New file
@@ -0,0 +1,9 @@
-- save operationRecord record
-- mysql
insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '操作日志管理', '0', '/system/operationRecord', '/system/operationRecord', '0' , '0', '1' , '1');

insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '查询操作日志', '', '1', 'system:operationRecord:list', '0', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '添加操作日志', '', '1', 'system:operationRecord:save', '1', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '修改操作日志', '', '1', 'system:operationRecord:update', '2', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '删除操作日志', '', '1', 'system:operationRecord:remove', '3', '1', '1');