From 012590ca2c7aebef2c42dbfb6b9a8b286d8181fb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 17 二月 2024 17:04:53 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dept.java | 5
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java | 101 +++
zy-asrs-flow/src/pages/system/dept/components/edit.jsx | 211 ++++++
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java | 1
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java | 21
zy-asrs-wcs/src/main/java/dept.sql | 9
zy-asrs-flow/src/pages/system/user/components/edit.jsx | 237 +++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java | 16
zy-asrs-flow/src/pages/system/dept/index.jsx | 533 ++++++++++++++++
zy-asrs-flow/src/pages/system/user/index.jsx | 723 ++++++++++++++++-----
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DeptController.java | 101 +++
zy-asrs-wcs/src/main/java/user.sql | 9
13 files changed, 1,778 insertions(+), 193 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/dept/components/edit.jsx b/zy-asrs-flow/src/pages/system/dept/components/edit.jsx
new file mode 100644
index 0000000..e6de44a
--- /dev/null
+++ b/zy-asrs-flow/src/pages/system/dept/components/edit.jsx
@@ -0,0 +1,211 @@
+import React, { useState, useRef, useEffect } from 'react';
+import {
+ ProForm,
+ ProFormDigit,
+ ProFormText,
+ ProFormSelect,
+ ProFormDateTimePicker
+} from '@ant-design/pro-components';
+import { Form, Modal } from 'antd';
+import moment from 'moment';
+import Http from '@/utils/http';
+
+const Edit = (props) => {
+ const [form] = Form.useForm();
+ const { } = props;
+
+ useEffect(() => {
+ form.resetFields();
+ form.setFieldsValue({
+ ...props.values
+ })
+ }, [form, props])
+
+ const handleCancel = () => {
+ props.onCancel();
+ };
+
+ const handleOk = () => {
+ form.submit();
+ }
+
+ const handleFinish = async (values) => {
+ props.onSubmit({ ...values });
+ }
+
+ return (
+ <>
+ <Modal
+ title="Edit"
+ width={640}
+ forceRender
+ destroyOnClose
+ open={props.open}
+ onCancel={handleCancel}
+ onOk={handleOk}
+ >
+ <ProForm
+ form={form}
+ submitter={false}
+ onFinish={handleFinish}
+ layout="horizontal"
+ grid={true}
+ >
+ <ProFormDigit
+ name="id"
+ disabled
+ hidden={true}
+ />
+ <ProForm.Group>
+ <ProFormText
+ name="name"
+ label="鍚嶇О"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ rules={[{ required: true, message: "鍚嶇О涓嶈兘涓虹┖锛�" }]}
+ />
+ <ProFormDigit
+ name="parentId"
+ label="涓婄骇閮ㄩ棬"
+ colProps={{ md: 12, xl: 12 }}
+ fieldProps={{ precision: 0 }}
+ placeholder="璇疯緭鍏�"
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormText
+ name="parentName"
+ label="涓婄骇閮ㄩ棬鍚�"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ <ProFormText
+ name="path"
+ label="鍏宠仈璺緞"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormText
+ name="pathName"
+ label="鍏宠仈璺緞鍚�"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ <ProFormText
+ name="fullName"
+ label="鍏ㄧО"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormText
+ name="brief"
+ label="绠�杩�"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ <ProFormText
+ name="code"
+ label="鏍囪瘑"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormDigit
+ name="type"
+ label="绫诲瀷"
+ colProps={{ md: 12, xl: 12 }}
+ fieldProps={{ precision: 0 }}
+ placeholder="璇疯緭鍏�"
+ />
+ <ProFormText
+ name="leader"
+ label="璐熻矗浜�"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormDigit
+ name="count"
+ label="鏁伴噺"
+ colProps={{ md: 12, xl: 12 }}
+ fieldProps={{ precision: 0 }}
+ placeholder="璇疯緭鍏�"
+ />
+ <ProFormDigit
+ name="sort"
+ label="鎺掑簭"
+ colProps={{ md: 12, xl: 12 }}
+ fieldProps={{ precision: 0 }}
+ placeholder="璇疯緭鍏�"
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormSelect
+ name="status"
+ label="鐘舵��"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇烽�夋嫨"
+ options={[
+ { label: '姝ｅ父', value: 1 },
+ { label: '绂佺敤', value: 0 },
+ ]}
+ />
+ <ProFormDateTimePicker
+ name="createTime"
+ label="娣诲姞鏃堕棿"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇烽�夋嫨"
+ transform={(value) => moment(value).toISOString()}
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormSelect
+ name="createBy"
+ label="娣诲姞浜哄憳"
+ colProps={{ md: 12, xl: 12 }}
+ fieldProps={{ precision: 0 }}
+ placeholder="璇烽�夋嫨"
+ showSearch
+ debounceTime={300}
+ request={async ({ keyWords }) => {
+ const resp = await Http.doPostForm('api/user/query', { condition: keyWords });
+ return resp.data;
+ }}
+ />
+ <ProFormDateTimePicker
+ name="updateTime"
+ label="淇敼鏃堕棿"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇烽�夋嫨"
+ transform={(value) => moment(value).toISOString()}
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormSelect
+ name="updateBy"
+ label="淇敼浜哄憳"
+ colProps={{ md: 12, xl: 12 }}
+ fieldProps={{ precision: 0 }}
+ placeholder="璇烽�夋嫨"
+ showSearch
+ debounceTime={300}
+ request={async ({ keyWords }) => {
+ const resp = await Http.doPostForm('api/user/query', { condition: keyWords });
+ return resp.data;
+ }}
+ />
+ </ProForm.Group>
+
+ </ProForm>
+ </Modal>
+ </>
+ )
+}
+
+export default Edit;
diff --git a/zy-asrs-flow/src/pages/system/dept/index.jsx b/zy-asrs-flow/src/pages/system/dept/index.jsx
new file mode 100644
index 0000000..c4cb0de
--- /dev/null
+++ b/zy-asrs-flow/src/pages/system/dept/index.jsx
@@ -0,0 +1,533 @@
+
+import React, { useState, useRef, useEffect } from 'react';
+import { Button, message, Modal } from 'antd';
+import {
+ FooterToolbar,
+ PageContainer,
+ ProTable,
+ LightFilter,
+} from '@ant-design/pro-components';
+import { PlusOutlined, ExportOutlined } from '@ant-design/icons';
+import Http from '@/utils/http';
+import Edit from './components/edit'
+import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
+
+const handleSave = async (val) => {
+ const hide = message.loading('姝ｅ湪娣诲姞');
+ try {
+ const resp = await Http.doPost('api/dept/save', val);
+ if (resp.code === 200) {
+ message.success('娣诲姞鎴愬姛');
+ return true;
+ } else {
+ message.error(resp.msg);
+ return false;
+ }
+ } catch (error) {
+ message.error('娣诲姞澶辫触璇烽噸璇曪紒');
+ return false;
+ } finally {
+ hide();
+ }
+};
+
+const handleUpdate = async (val) => {
+ const hide = message.loading('姝ｅ湪鏇存柊');
+ try {
+ const resp = await Http.doPost('api/dept/update', val);
+ if (resp.code === 200) {
+ message.success('鏇存柊鎴愬姛');
+ return true;
+ } else {
+ message.error(resp.msg);
+ return false;
+ }
+ } catch (error) {
+ message.error('閰嶇疆澶辫触璇烽噸璇曪紒');
+ return false;
+ } finally {
+ hide();
+ }
+};
+
+const handleRemove = async (rows) => {
+ if (!rows) return true;
+ const hide = message.loading('姝ｅ湪鍒犻櫎');
+ try {
+ const resp = await Http.doPost('api/dept/remove/' + rows.map((row) => row.id).join(','));
+ if (resp.code === 200) {
+ message.success('鍒犻櫎鎴愬姛');
+ return true;
+ } else {
+ message.error(resp.msg);
+ return false;
+ }
+ } catch (error) {
+ message.error('鍒犻櫎澶辫触锛岃閲嶈瘯');
+ return false;
+ } finally {
+ hide();
+ }
+};
+
+const handleExport = async () => {
+ const hide = message.loading('姝ｅ湪瀵煎嚭');
+ try {
+ const resp = await Http.doPostBlob('api/dept/export');
+ const blob = new Blob([resp], { type: 'application/vnd.ms-excel' });
+ window.location.href = window.URL.createObjectURL(blob);
+ message.success('瀵煎嚭鎴愬姛');
+ return true;
+ } catch (error) {
+ message.error('瀵煎嚭澶辫触锛岃閲嶈瘯');
+ return false;
+ } finally {
+ hide();
+ }
+};
+
+
+const Main = () => {
+ const formTableRef = useRef();
+ const actionRef = useRef();
+ const [selectedRows, setSelectedRows] = useState([]);
+ const [modalVisible, setModalVisible] = useState(false);
+ const [currentRow, setCurrentRow] = useState();
+ const [searchParam, setSearchParam] = useState({});
+
+ useEffect(() => {
+
+ }, []);
+
+ const columns = [
+ {
+ title: 'No',
+ dataIndex: 'index',
+ valueType: 'indexBorder',
+ width: 48,
+ },
+ {
+ title: '鍚嶇О',
+ dataIndex: 'name',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ copyable: true,
+ filterDropdown: (props) => <TextFilter
+ name='name'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '涓婄骇閮ㄩ棬',
+ dataIndex: 'parentId',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='parentId'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '涓婄骇閮ㄩ棬鍚�',
+ dataIndex: 'parentName',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='parentName'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '鍏宠仈璺緞',
+ dataIndex: 'path',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='path'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '鍏宠仈璺緞鍚�',
+ dataIndex: 'pathName',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='pathName'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '鍏ㄧО',
+ dataIndex: 'fullName',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='fullName'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '绠�杩�',
+ dataIndex: 'brief',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='brief'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '鏍囪瘑',
+ dataIndex: 'code',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='code'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '绫诲瀷',
+ dataIndex: 'type',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='type'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '璐熻矗浜�',
+ dataIndex: 'leader',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='leader'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '鏁伴噺',
+ dataIndex: 'count',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='count'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '鎺掑簭',
+ dataIndex: 'sort',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='sort'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '鐘舵��',
+ dataIndex: 'status$',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <SelectFilter
+ name='status'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ data={[
+ { label: '姝ｅ父', value: 1 },
+ { label: '绂佺敤', value: 0 },
+ ]}
+ />,
+ },
+ {
+ title: '娣诲姞鏃堕棿',
+ dataIndex: 'createTime$',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <DatetimeRangeFilter
+ name='createTime'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '娣诲姞浜哄憳',
+ dataIndex: 'createBy$',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <LinkFilter
+ name='createBy'
+ major='user'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '淇敼鏃堕棿',
+ dataIndex: 'updateTime$',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <DatetimeRangeFilter
+ name='updateTime'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '淇敼浜哄憳',
+ dataIndex: 'updateBy$',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <LinkFilter
+ name='updateBy'
+ major='user'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '澶囨敞',
+ dataIndex: 'memo',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='memo'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'option',
+ width: 140,
+ valueType: 'option',
+ render: (_, record) => [
+ <Button
+ type="link"
+ key="edit"
+ onClick={() => {
+ setModalVisible(true);
+ setCurrentRow(record);
+ }}
+ >
+ 缂栬緫
+ </Button>,
+ <Button
+ type="link"
+ danger
+ key="batchRemove"
+ onClick={async () => {
+ Modal.confirm({
+ title: '鍒犻櫎',
+ content: '纭畾鍒犻櫎璇ラ」鍚楋紵',
+ onOk: async () => {
+ const success = await handleRemove([record]);
+ if (success) {
+ if (actionRef.current) {
+ actionRef.current.reload();
+ }
+ }
+ },
+ });
+ }}
+ >
+ 鍒犻櫎
+ </Button>,
+ ],
+ },
+ ];
+
+ return (
+ <PageContainer>
+ <div style={{ width: '100%', float: 'right' }}>
+ <ProTable
+ key="dept"
+ rowKey="id"
+ actionRef={actionRef}
+ formRef={formTableRef}
+ columns={columns}
+ cardBordered
+ scroll={{ x: 1300 }}
+ dateFormatter="string"
+ pagination={{ pageSize: 20 }}
+ search={false}
+ toolbar={{
+ search: {
+ onSearch: (value) => {
+ setSearchParam(prevState => ({
+ ...prevState,
+ condition: value
+ }));
+ actionRef.current?.reload();
+ },
+ },
+ filter: (
+ <LightFilter
+ onValuesChange={(val) => {
+ }}
+ >
+ </LightFilter>
+ ),
+ actions: [
+ <Button
+ type="primary"
+ key="save"
+ onClick={async () => {
+ setModalVisible(true)
+ }}
+ >
+ <PlusOutlined />
+ 娣诲姞
+ </Button>,
+ <Button
+ key="export"
+ onClick={async () => {
+ handleExport();
+ }}
+ >
+ <ExportOutlined />
+ 瀵煎嚭
+ </Button>,
+ ],
+ }}
+ request={(params, sorter, filter) =>
+ Http.doPostPromise('/api/dept/page', { ...params, ...searchParam }, (res) => {
+ return {
+ data: res.data.records,
+ total: res.data.total,
+ success: true,
+ }
+ })
+ }
+ rowSelection={{
+ onChange: (ids, rows) => {
+ setSelectedRows(rows);
+ }
+ }}
+ columnsState={{
+ persistenceKey: 'pro-table-dept',
+ persistenceType: 'localStorage',
+ defaultValue: {
+ option: { fixed: 'right', disable: true },
+ },
+ onChange(value) {
+ },
+ }}
+ />
+ </div>
+
+ {selectedRows?.length > 0 && (
+ <FooterToolbar
+ extra={
+ <div>
+ 宸查�夋嫨
+ <a style={{ fontWeight: 600 }}>{selectedRows.length}</a>
+ 椤�
+ </div>
+ }
+ >
+ <Button
+ key="remove"
+ danger
+ onClick={async () => {
+ Modal.confirm({
+ title: '鍒犻櫎',
+ content: '纭畾鍒犻櫎璇ラ」鍚楋紵',
+ onOk: async () => {
+ const success = await handleRemove(selectedRows);
+ if (success) {
+ setSelectedRows([]);
+ actionRef.current?.reloadAndRest?.();
+ }
+ },
+ });
+ }}
+ >
+ 鎵归噺鍒犻櫎
+ </Button>
+ </FooterToolbar>
+ )}
+
+ <Edit
+ open={modalVisible}
+ values={currentRow || {}}
+ onCancel={
+ () => {
+ setModalVisible(false);
+ setCurrentRow(undefined);
+ }
+ }
+ onSubmit={async (values) => {
+ let ok = false;
+ if (values.id) {
+ ok = await handleUpdate({ ...values })
+ } else {
+ ok = await handleSave({ ...values })
+ }
+ if (ok) {
+ setModalVisible(false);
+ setCurrentRow(undefined);
+ if (actionRef.current) {
+ actionRef.current.reload();
+ }
+ }
+ }
+ }
+ />
+ </PageContainer>
+ );
+};
+
+export default Main;
diff --git a/zy-asrs-flow/src/pages/system/user/components/edit.jsx b/zy-asrs-flow/src/pages/system/user/components/edit.jsx
new file mode 100644
index 0000000..257eaad
--- /dev/null
+++ b/zy-asrs-flow/src/pages/system/user/components/edit.jsx
@@ -0,0 +1,237 @@
+import React, { useState, useRef, useEffect } from 'react';
+import {
+ ProForm,
+ ProFormDigit,
+ ProFormText,
+ ProFormSelect,
+ ProFormDateTimePicker
+} from '@ant-design/pro-components';
+import { Form, Modal } from 'antd';
+import moment from 'moment';
+import Http from '@/utils/http';
+
+const Edit = (props) => {
+ const [form] = Form.useForm();
+ const { } = props;
+
+ useEffect(() => {
+ form.resetFields();
+ form.setFieldsValue({
+ ...props.values
+ })
+ }, [form, props])
+
+ const handleCancel = () => {
+ props.onCancel();
+ };
+
+ const handleOk = () => {
+ form.submit();
+ }
+
+ const handleFinish = async (values) => {
+ props.onSubmit({ ...values });
+ }
+
+ return (
+ <>
+ <Modal
+ title="Edit"
+ width={640}
+ forceRender
+ destroyOnClose
+ open={props.open}
+ onCancel={handleCancel}
+ onOk={handleOk}
+ >
+ <ProForm
+ form={form}
+ submitter={false}
+ onFinish={handleFinish}
+ layout="horizontal"
+ grid={true}
+ >
+ <ProFormDigit
+ name="id"
+ disabled
+ hidden={true}
+ />
+ <ProForm.Group>
+ <ProFormText
+ name="username"
+ label="璐﹀彿"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ rules={[{ required: true, message: "璐﹀彿涓嶈兘涓虹┖锛�" }]}
+ />
+ <ProFormText
+ name="password"
+ label="瀵嗙爜"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormText
+ name="nickname"
+ label="鏄电О"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ <ProFormText
+ name="avatar"
+ label="澶村儚"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormText
+ name="code"
+ label="宸ュ彿"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ <ProFormSelect
+ name="sex"
+ label="鎬у埆"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇烽�夋嫨"
+ options={[
+ { label: '鏈煡', value: 0 },
+ { label: '鐢�', value: 1 },
+ { label: '濂�', value: 2 },
+ ]}
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormText
+ name="phone"
+ label="鎵嬫満鍙�"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ <ProFormText
+ name="email"
+ label="閭"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormSelect
+ name="emailVerified"
+ label="閭楠岃瘉"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇烽�夋嫨"
+ options={[
+ { label: '鍚�', value: 0 },
+ { label: '鏄�', value: 1 },
+ ]}
+ />
+ <ProFormSelect
+ name="deptId"
+ label="鎵�灞為儴闂�"
+ colProps={{ md: 12, xl: 12 }}
+ fieldProps={{ precision: 0 }}
+ placeholder="璇烽�夋嫨"
+ showSearch
+ debounceTime={300}
+ request={async ({ keyWords }) => {
+ const resp = await Http.doPostForm('api/dept/query', { condition: keyWords });
+ return resp.data;
+ }}
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormText
+ name="realName"
+ label="鐪熷疄濮撳悕"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ <ProFormText
+ name="idCard"
+ label="韬唤璇佸彿"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormText
+ name="birthday"
+ label="鍑虹敓鏃ユ湡"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ <ProFormText
+ name="introduction"
+ label="涓汉绠�浠�"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇疯緭鍏�"
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormSelect
+ name="status"
+ label="鐘舵��"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇烽�夋嫨"
+ options={[
+ { label: '姝ｅ父', value: 1 },
+ { label: '绂佺敤', value: 0 },
+ ]}
+ />
+ <ProFormDateTimePicker
+ name="createTime"
+ label="娣诲姞鏃堕棿"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇烽�夋嫨"
+ transform={(value) => moment(value).toISOString()}
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormSelect
+ name="createBy"
+ label="娣诲姞浜哄憳"
+ colProps={{ md: 12, xl: 12 }}
+ fieldProps={{ precision: 0 }}
+ placeholder="璇烽�夋嫨"
+ showSearch
+ debounceTime={300}
+ request={async ({ keyWords }) => {
+ const resp = await Http.doPostForm('api/user/query', { condition: keyWords });
+ return resp.data;
+ }}
+ />
+ <ProFormDateTimePicker
+ name="updateTime"
+ label="淇敼鏃堕棿"
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇烽�夋嫨"
+ transform={(value) => moment(value).toISOString()}
+ />
+ </ProForm.Group>
+ <ProForm.Group>
+ <ProFormSelect
+ name="updateBy"
+ label="淇敼浜哄憳"
+ colProps={{ md: 12, xl: 12 }}
+ fieldProps={{ precision: 0 }}
+ placeholder="璇烽�夋嫨"
+ showSearch
+ debounceTime={300}
+ request={async ({ keyWords }) => {
+ const resp = await Http.doPostForm('api/user/query', { condition: keyWords });
+ return resp.data;
+ }}
+ />
+ </ProForm.Group>
+
+ </ProForm>
+ </Modal>
+ </>
+ )
+}
+
+export default Edit;
diff --git a/zy-asrs-flow/src/pages/system/user/index.jsx b/zy-asrs-flow/src/pages/system/user/index.jsx
index 7dfe2c5..56fc45c 100644
--- a/zy-asrs-flow/src/pages/system/user/index.jsx
+++ b/zy-asrs-flow/src/pages/system/user/index.jsx
@@ -1,188 +1,569 @@
-import React, { useState } from 'react';
-import {
- PageContainer,
-} from '@ant-design/pro-components';
-import { EllipsisOutlined, SearchOutlined } from '@ant-design/icons';
-import { ProTable, TableDropdown } from '@ant-design/pro-components';
-import { Button, Dropdown, Input } from 'antd';
-const valueEnum = {
- 0: 'close',
- 1: 'running',
- 2: 'online',
- 3: 'error',
+import React, { useState, useRef, useEffect } from 'react';
+import { Button, message, Modal } from 'antd';
+import {
+ FooterToolbar,
+ PageContainer,
+ ProTable,
+ LightFilter,
+} from '@ant-design/pro-components';
+import { PlusOutlined, ExportOutlined } from '@ant-design/icons';
+import Http from '@/utils/http';
+import Edit from './components/edit'
+import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
+
+const handleSave = async (val) => {
+ const hide = message.loading('姝ｅ湪娣诲姞');
+ try {
+ const resp = await Http.doPost('api/user/save', val);
+ if (resp.code === 200) {
+ message.success('娣诲姞鎴愬姛');
+ return true;
+ } else {
+ message.error(resp.msg);
+ return false;
+ }
+ } catch (error) {
+ message.error('娣诲姞澶辫触璇烽噸璇曪紒');
+ return false;
+ } finally {
+ hide();
+ }
};
-const tableListDataSource = [];
+const handleUpdate = async (val) => {
+ const hide = message.loading('姝ｅ湪鏇存柊');
+ try {
+ const resp = await Http.doPost('api/user/update', val);
+ if (resp.code === 200) {
+ message.success('鏇存柊鎴愬姛');
+ return true;
+ } else {
+ message.error(resp.msg);
+ return false;
+ }
+ } catch (error) {
+ message.error('閰嶇疆澶辫触璇烽噸璇曪紒');
+ return false;
+ } finally {
+ hide();
+ }
+};
-const creators = ['浠樺皬灏�', '鏇蹭附涓�', '鏋椾笢涓�', '闄堝竻甯�', '鍏兼煇鏌�'];
+const handleRemove = async (rows) => {
+ if (!rows) return true;
+ const hide = message.loading('姝ｅ湪鍒犻櫎');
+ try {
+ const resp = await Http.doPost('api/user/remove/' + rows.map((row) => row.id).join(','));
+ if (resp.code === 200) {
+ message.success('鍒犻櫎鎴愬姛');
+ return true;
+ } else {
+ message.error(resp.msg);
+ return false;
+ }
+ } catch (error) {
+ message.error('鍒犻櫎澶辫触锛岃閲嶈瘯');
+ return false;
+ } finally {
+ hide();
+ }
+};
-for (let i = 0; i < 25; i += 1) {
- tableListDataSource.push({
- key: i,
- name: 'AppName',
- containers: Math.floor(Math.random() * 20),
- creator: creators[Math.floor(Math.random() * creators.length)],
- status: valueEnum[((Math.floor(Math.random() * 10) % 4) + '')],
- createdAt: Date.now() - Math.floor(Math.random() * 2000),
- money: Math.floor(Math.random() * 2000) * i,
- progress: Math.ceil(Math.random() * 100) + 1,
- memo:
- i % 2 === 1
- ? '寰堥暱寰堥暱寰堥暱寰堥暱寰堥暱寰堥暱寰堥暱鐨勬枃瀛楄灞曠ず浣嗘槸瑕佺暀涓嬪熬宸�'
- : '绠�鐭娉ㄦ枃妗�',
- });
-}
+const handleExport = async () => {
+ const hide = message.loading('姝ｅ湪瀵煎嚭');
+ try {
+ const resp = await Http.doPostBlob('api/user/export');
+ const blob = new Blob([resp], { type: 'application/vnd.ms-excel' });
+ window.location.href = window.URL.createObjectURL(blob);
+ message.success('瀵煎嚭鎴愬姛');
+ return true;
+ } catch (error) {
+ message.error('瀵煎嚭澶辫触锛岃閲嶈瘯');
+ return false;
+ } finally {
+ hide();
+ }
+};
-const columns = [
- {
- title: '鎺掑簭',
- dataIndex: 'index',
- valueType: 'indexBorder',
- width: 48,
- },
- {
- title: '搴旂敤鍚嶇О',
- dataIndex: 'name',
- render: (_) => <a>{_}</a>,
- // 鑷畾涔夌瓫閫夐」鍔熻兘鍏蜂綋瀹炵幇璇峰弬鑰� https://ant.design/components/table-cn/#components-table-demo-custom-filter-panel
- filterDropdown: () => (
- <div style={{ padding: 8 }}>
- <Input style={{ width: 188, marginBlockEnd: 8, display: 'block' }} />
- </div>
- ),
- filterIcon: (filtered) => (
- <SearchOutlined style={{ color: filtered ? '#1890ff' : undefined }} />
- ),
- },
- {
- title: '鍒涘缓鑰�',
- dataIndex: 'creator',
- valueEnum: {
- all: { text: '鍏ㄩ儴' },
- 浠樺皬灏�: { text: '浠樺皬灏�' },
- 鏇蹭附涓�: { text: '鏇蹭附涓�' },
- 鏋椾笢涓�: { text: '鏋椾笢涓�' },
- 闄堝竻甯�: { text: '闄堝竻甯�' },
- 鍏兼煇鏌�: { text: '鍏兼煇鏌�' },
+
+const Main = () => {
+ const formTableRef = useRef();
+ const actionRef = useRef();
+ const [selectedRows, setSelectedRows] = useState([]);
+ const [modalVisible, setModalVisible] = useState(false);
+ const [currentRow, setCurrentRow] = useState();
+ const [searchParam, setSearchParam] = useState({});
+
+ useEffect(() => {
+
+ }, []);
+
+ const columns = [
+ {
+ title: 'No',
+ dataIndex: 'index',
+ valueType: 'indexBorder',
+ width: 48,
},
- },
- {
- title: '鐘舵��',
- dataIndex: 'status',
- initialValue: 'all',
- filters: true,
- onFilter: true,
- valueEnum: {
- all: { text: '鍏ㄩ儴', status: 'Default' },
- close: { text: '鍏抽棴', status: 'Default' },
- running: { text: '杩愯涓�', status: 'Processing' },
- online: { text: '宸蹭笂绾�', status: 'Success' },
- error: { text: '寮傚父', status: 'Error' },
+ {
+ title: '璐﹀彿',
+ dataIndex: 'username',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='username'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
},
- },
- {
- title: '澶囨敞',
- dataIndex: 'memo',
- ellipsis: true,
- copyable: true,
- },
- {
- title: '鎿嶄綔',
- width: 180,
- key: 'option',
- valueType: 'option',
- render: () => [
- <a key="link">閾捐矾</a>,
- <a key="link2">鎶ヨ</a>,
- <a key="link3">鐩戞帶</a>,
- <TableDropdown
- key="actionGroup"
- menus={[
- { key: 'copy', name: '澶嶅埗' },
- { key: 'delete', name: '鍒犻櫎' },
+ {
+ title: '瀵嗙爜',
+ dataIndex: 'password',
+ valueType: 'password',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='password'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '鏄电О',
+ dataIndex: 'nickname',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ copyable: true,
+ filterDropdown: (props) => <TextFilter
+ name='nickname'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '澶村儚',
+ dataIndex: 'avatar',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='avatar'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '宸ュ彿',
+ dataIndex: 'code',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='code'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '鎬у埆',
+ dataIndex: 'sex$',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <SelectFilter
+ name='sex'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ data={[
+ { label: '鏈煡', value: 0 },
+ { label: '鐢�', value: 1 },
+ { label: '濂�', value: 2 },
]}
/>,
- ],
- },
-];
+ },
+ {
+ title: '鎵嬫満鍙�',
+ dataIndex: 'phone',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='phone'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '閭',
+ dataIndex: 'email',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='email'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '閭楠岃瘉',
+ dataIndex: 'emailVerified$',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <SelectFilter
+ name='emailVerified'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ data={[
+ { label: '鍚�', value: 0 },
+ { label: '鏄�', value: 1 },
+ ]}
+ />,
+ },
+ {
+ title: '鎵�灞為儴闂�',
+ dataIndex: 'deptId$',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <LinkFilter
+ name='deptId'
+ major='dept'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '鐪熷疄濮撳悕',
+ dataIndex: 'realName',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='realName'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '韬唤璇佸彿',
+ dataIndex: 'idCard',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='idCard'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '鍑虹敓鏃ユ湡',
+ dataIndex: 'birthday',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='birthday'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '涓汉绠�浠�',
+ dataIndex: 'introduction',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='introduction'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '鐘舵��',
+ dataIndex: 'status$',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <SelectFilter
+ name='status'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ data={[
+ { label: '姝ｅ父', value: 1 },
+ { label: '绂佺敤', value: 0 },
+ ]}
+ />,
+ },
+ {
+ title: '娣诲姞鏃堕棿',
+ dataIndex: 'createTime$',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <DatetimeRangeFilter
+ name='createTime'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '娣诲姞浜哄憳',
+ dataIndex: 'createBy$',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <LinkFilter
+ name='createBy'
+ major='user'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '淇敼鏃堕棿',
+ dataIndex: 'updateTime$',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <DatetimeRangeFilter
+ name='updateTime'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '淇敼浜哄憳',
+ dataIndex: 'updateBy$',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <LinkFilter
+ name='updateBy'
+ major='user'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '澶囨敞',
+ dataIndex: 'memo',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='memo'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
-const App = () => {
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'option',
+ width: 140,
+ valueType: 'option',
+ render: (_, record) => [
+ <Button
+ type="link"
+ key="edit"
+ onClick={() => {
+ setModalVisible(true);
+ setCurrentRow(record);
+ }}
+ >
+ 缂栬緫
+ </Button>,
+ <Button
+ type="link"
+ danger
+ key="batchRemove"
+ onClick={async () => {
+ Modal.confirm({
+ title: '鍒犻櫎',
+ content: '纭畾鍒犻櫎璇ラ」鍚楋紵',
+ onOk: async () => {
+ const success = await handleRemove([record]);
+ if (success) {
+ if (actionRef.current) {
+ actionRef.current.reload();
+ }
+ }
+ },
+ });
+ }}
+ >
+ 鍒犻櫎
+ </Button>,
+ ],
+ },
+ ];
+
return (
- <>
- <PageContainer>
- <div style={{ width: '100%', float: 'right' }}>
- <ProTable
- columns={columns}
- request={(params, sorter, filter) => {
- // 琛ㄥ崟鎼滅储椤逛細浠� params 浼犲叆锛屼紶閫掔粰鍚庣鎺ュ彛銆�
- console.log(params, sorter, filter);
- return Promise.resolve({
- data: tableListDataSource,
- success: true,
- });
- }}
- rowKey="key"
- pagination={{
- showQuickJumper: true,
- }}
- search={{
- layout: 'vertical',
- defaultCollapsed: false,
- }}
- dateFormatter="string"
- toolbar={{
- title: '楂樼骇琛ㄦ牸',
- tooltip: '杩欐槸涓�涓爣棰樻彁绀�',
- }}
- toolBarRender={() => [
- <Button key="danger" danger>
- 鍗遍櫓鎸夐挳
- </Button>,
- <Button key="show">鏌ョ湅鏃ュ織</Button>,
- <Button type="primary" key="primary">
- 鍒涘缓搴旂敤
- </Button>,
-
- <Dropdown
- key="menu"
- menu={{
- items: [
- {
- label: '1st item',
- key: '1',
- },
- {
- label: '2nd item',
- key: '2',
- },
- {
- label: '3rd item',
- key: '3',
- },
- ],
+ <PageContainer>
+ <div style={{ width: '100%', float: 'right' }}>
+ <ProTable
+ key="user"
+ rowKey="id"
+ actionRef={actionRef}
+ formRef={formTableRef}
+ columns={columns}
+ cardBordered
+ scroll={{ x: 1300 }}
+ dateFormatter="string"
+ pagination={{ pageSize: 20 }}
+ search={false}
+ toolbar={{
+ search: {
+ onSearch: (value) => {
+ setSearchParam(prevState => ({
+ ...prevState,
+ condition: value
+ }));
+ actionRef.current?.reload();
+ },
+ },
+ filter: (
+ <LightFilter
+ onValuesChange={(val) => {
}}
>
- <Button>
- <EllipsisOutlined />
- </Button>
- </Dropdown>,
- ]}
- />
- </div>
- </PageContainer>
- </>
+ </LightFilter>
+ ),
+ actions: [
+ <Button
+ type="primary"
+ key="save"
+ onClick={async () => {
+ setModalVisible(true)
+ }}
+ >
+ <PlusOutlined />
+ 娣诲姞
+ </Button>,
+ <Button
+ key="export"
+ onClick={async () => {
+ handleExport();
+ }}
+ >
+ <ExportOutlined />
+ 瀵煎嚭
+ </Button>,
+ ],
+ }}
+ request={(params, sorter, filter) =>
+ Http.doPostPromise('/api/user/page', { ...params, ...searchParam }, (res) => {
+ return {
+ data: res.data.records,
+ total: res.data.total,
+ success: true,
+ }
+ })
+ }
+ rowSelection={{
+ onChange: (ids, rows) => {
+ setSelectedRows(rows);
+ }
+ }}
+ columnsState={{
+ persistenceKey: 'pro-table-user',
+ persistenceType: 'localStorage',
+ defaultValue: {
+ option: { fixed: 'right', disable: true },
+ },
+ onChange(value) {
+ },
+ }}
+ />
+ </div>
+
+ {selectedRows?.length > 0 && (
+ <FooterToolbar
+ extra={
+ <div>
+ 宸查�夋嫨
+ <a style={{ fontWeight: 600 }}>{selectedRows.length}</a>
+ 椤�
+ </div>
+ }
+ >
+ <Button
+ key="remove"
+ danger
+ onClick={async () => {
+ Modal.confirm({
+ title: '鍒犻櫎',
+ content: '纭畾鍒犻櫎璇ラ」鍚楋紵',
+ onOk: async () => {
+ const success = await handleRemove(selectedRows);
+ if (success) {
+ setSelectedRows([]);
+ actionRef.current?.reloadAndRest?.();
+ }
+ },
+ });
+ }}
+ >
+ 鎵归噺鍒犻櫎
+ </Button>
+ </FooterToolbar>
+ )}
+
+ <Edit
+ open={modalVisible}
+ values={currentRow || {}}
+ onCancel={
+ () => {
+ setModalVisible(false);
+ setCurrentRow(undefined);
+ }
+ }
+ onSubmit={async (values) => {
+ let ok = false;
+ if (values.id) {
+ ok = await handleUpdate({ ...values })
+ } else {
+ ok = await handleSave({ ...values })
+ }
+ if (ok) {
+ setModalVisible(false);
+ setCurrentRow(undefined);
+ if (actionRef.current) {
+ actionRef.current.reload();
+ }
+ }
+ }
+ }
+ />
+ </PageContainer>
);
};
-const User = () => {
- return (
- <>
- <PageContainer>
- <h1>User Hello world</h1>
- </PageContainer>
- </>
- )
-}
-
-export default App;
+export default Main;
diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
index 9a088ca..e7e9631 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
@@ -954,6 +954,7 @@
.append(" debounceTime={300}\n")
.append(" request={async ({ keyWords }) => {\n")
.append(" const resp = await Http.doPostForm('api/").append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append("/query', { condition: keyWords });\n")
+ .append(" return resp.data;\n")
.append(" }}\n");
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DeptController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DeptController.java
new file mode 100644
index 0000000..75a7ffb
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DeptController.java
@@ -0,0 +1,101 @@
+package com.zy.asrs.wcs.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.wcs.common.annotation.OperationLog;
+import com.zy.asrs.wcs.common.domain.BaseParam;
+import com.zy.asrs.wcs.common.domain.KeyValVo;
+import com.zy.asrs.wcs.common.domain.PageParam;
+import com.zy.asrs.wcs.system.entity.Dept;
+import com.zy.asrs.wcs.system.service.DeptService;
+import com.zy.asrs.wcs.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 DeptController extends BaseController {
+
+ @Autowired
+ private DeptService deptService;
+
+ @PreAuthorize("hasAuthority('system:dept:list')")
+ @PostMapping("/dept/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Dept, BaseParam> pageParam = new PageParam<>(baseParam, Dept.class);
+ return R.ok().add(deptService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('system:dept:list')")
+ @PostMapping("/dept/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(deptService.list());
+ }
+
+ @PreAuthorize("hasAuthority('system:dept:list')")
+ @GetMapping("/dept/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(deptService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('system:dept:save')")
+ @OperationLog("娣诲姞Dept")
+ @PostMapping("/dept/save")
+ public R save(@RequestBody Dept dept) {
+ if (!deptService.save(dept)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('system:dept:update')")
+ @OperationLog("淇敼Dept")
+ @PostMapping("/dept/update")
+ public R update(@RequestBody Dept dept) {
+ if (!deptService.updateById(dept)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('system:dept:remove')")
+ @OperationLog("鍒犻櫎Dept")
+ @PostMapping("/dept/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!deptService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('system:dept:list')")
+ @PostMapping("/dept/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<Dept> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(Dept::getName, condition);
+ }
+ deptService.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:dept:list')")
+ @PostMapping("/dept/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(deptService.list(), Dept.class), response);
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java
index 61ae217..574cdd7 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java
@@ -31,7 +31,7 @@
@Autowired
private RoleService roleService;
- @PreAuthorize("hasAuthority('sys:role:list')")
+ @PreAuthorize("hasAuthority('system:role:list')")
@PostMapping("/role/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
@@ -39,19 +39,19 @@
return R.ok().add(roleService.page(pageParam, pageParam.buildWrapper(true)));
}
- @PreAuthorize("hasAuthority('sys:role:list')")
+ @PreAuthorize("hasAuthority('system:role:list')")
@PostMapping("/role/list")
public R list(@RequestBody Map<String, Object> map) {
return R.ok().add(roleService.list());
}
- @PreAuthorize("hasAuthority('sys:role:list')")
+ @PreAuthorize("hasAuthority('system:role:list')")
@GetMapping("/role/{id}")
public R get(@PathVariable("id") Long id) {
return R.ok().add(roleService.getById(id));
}
- @PreAuthorize("hasAuthority('sys:role:save')")
+ @PreAuthorize("hasAuthority('system:role:save')")
@OperationLog("娣诲姞瑙掕壊")
@PostMapping("/role/save")
public R save(@RequestBody Role role) {
@@ -69,7 +69,7 @@
return R.ok("娣诲姞鎴愬姛");
}
- @PreAuthorize("hasAuthority('sys:role:update')")
+ @PreAuthorize("hasAuthority('system:role:update')")
@OperationLog("淇敼瑙掕壊")
@PostMapping("/role/update")
public R update(@RequestBody Role role) {
@@ -89,7 +89,7 @@
return R.ok("淇敼鎴愬姛");
}
- @PreAuthorize("hasAuthority('sys:role:remove')")
+ @PreAuthorize("hasAuthority('system:role:remove')")
@OperationLog("鍒犻櫎瑙掕壊")
@PostMapping("/role/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
@@ -99,7 +99,7 @@
return R.ok("鍒犻櫎鎴愬姛");
}
- @PreAuthorize("hasAuthority('sys:role:list')")
+ @PreAuthorize("hasAuthority('system:role:list')")
@PostMapping("/role/query")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
@@ -113,7 +113,7 @@
return R.ok().add(vos);
}
- @PreAuthorize("hasAuthority('sys:role:list')")
+ @PreAuthorize("hasAuthority('system:role:list')")
@PostMapping("/role/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
ExcelUtil.build(ExcelUtil.create(roleService.list(), Role.class), response);
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
new file mode 100644
index 0000000..aad06d8
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
@@ -0,0 +1,101 @@
+package com.zy.asrs.wcs.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.wcs.common.annotation.OperationLog;
+import com.zy.asrs.wcs.common.domain.BaseParam;
+import com.zy.asrs.wcs.common.domain.KeyValVo;
+import com.zy.asrs.wcs.common.domain.PageParam;
+import com.zy.asrs.wcs.system.entity.User;
+import com.zy.asrs.wcs.system.service.UserService;
+import com.zy.asrs.wcs.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 UserController extends BaseController {
+
+ @Autowired
+ private UserService userService;
+
+ @PreAuthorize("hasAuthority('system:user:list')")
+ @PostMapping("/user/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<User, BaseParam> pageParam = new PageParam<>(baseParam, User.class);
+ return R.ok().add(userService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('system:user:list')")
+ @PostMapping("/user/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(userService.list());
+ }
+
+ @PreAuthorize("hasAuthority('system:user:list')")
+ @GetMapping("/user/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(userService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('system:user:save')")
+ @OperationLog("娣诲姞User")
+ @PostMapping("/user/save")
+ public R save(@RequestBody User user) {
+ if (!userService.save(user)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('system:user:update')")
+ @OperationLog("淇敼User")
+ @PostMapping("/user/update")
+ public R update(@RequestBody User user) {
+ if (!userService.updateById(user)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('system:user:remove')")
+ @OperationLog("鍒犻櫎User")
+ @PostMapping("/user/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!userService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('system:user:list')")
+ @PostMapping("/user/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(User::getNickname, condition);
+ }
+ userService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getNickname()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('system:user:list')")
+ @PostMapping("/user/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(userService.list(), User.class), response);
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dept.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dept.java
index 852affa..5f6d8b4 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dept.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dept.java
@@ -244,7 +244,7 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.createBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getId());
+ return String.valueOf(user.getNickname());
}
return null;
}
@@ -260,9 +260,10 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.updateBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getId());
+ return String.valueOf(user.getNickname());
}
return null;
}
+
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java
index 7fe7403..0cd193d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wcs.system.service.DeptService;
import com.zy.asrs.wcs.system.service.HostService;
import com.zy.asrs.wcs.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -247,14 +248,14 @@
}
}
-// public String getDeptId$(){
-// DeptService service = SpringUtils.getBean(DeptService.class);
-// Dept dept = service.getById(this.deptId);
-// if (!Cools.isEmpty(dept)){
-// return String.valueOf(dept.getName());
-// }
-// return null;
-// }
+ public String getDeptId$(){
+ DeptService service = SpringUtils.getBean(DeptService.class);
+ Dept dept = service.getById(this.deptId);
+ if (!Cools.isEmpty(dept)){
+ return String.valueOf(dept.getName());
+ }
+ return null;
+ }
public String getHostId$(){
HostService service = SpringUtils.getBean(HostService.class);
@@ -300,7 +301,7 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.createBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getId());
+ return String.valueOf(user.getNickname());
}
return null;
}
@@ -316,7 +317,7 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.updateBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getId());
+ return String.valueOf(user.getNickname());
}
return null;
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
index b4466f1..4a985ee 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
@@ -22,8 +22,8 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="sys_dept";
- generator.tableName="閮ㄩ棬";
+ generator.table="sys_user";
+ generator.tableName="鐢ㄦ埛";
generator.packagePath="com.zy.asrs.wcs.system";
generator.build();
diff --git a/zy-asrs-wcs/src/main/java/dept.sql b/zy-asrs-wcs/src/main/java/dept.sql
new file mode 100644
index 0000000..0282c27
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/dept.sql
@@ -0,0 +1,9 @@
+-- save dept record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `type`, `sort`, `host_id`, `status`) values ( '閮ㄩ棬绠＄悊', '0', '/system/dept', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ閮ㄩ棬', '', '1', 'system:dept:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞閮ㄩ棬', '', '1', 'system:dept:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼閮ㄩ棬', '', '1', 'system:dept:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎閮ㄩ棬', '', '1', 'system:dept:remove', '3', '1', '1');
+
diff --git a/zy-asrs-wcs/src/main/java/user.sql b/zy-asrs-wcs/src/main/java/user.sql
new file mode 100644
index 0000000..917778f
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/user.sql
@@ -0,0 +1,9 @@
+-- save user record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `type`, `sort`, `host_id`, `status`) values ( '鐢ㄦ埛绠＄悊', '0', '/system/user', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ鐢ㄦ埛', '', '1', 'system:user:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞鐢ㄦ埛', '', '1', 'system:user:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼鐢ㄦ埛', '', '1', 'system:user:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎鐢ㄦ埛', '', '1', 'system:user:remove', '3', '1', '1');
+
--
Gitblit v1.9.1