（*）备份恢复初始代码提交

web/client/src/app.js

@@ -11,6 +11,7 @@ import resourceRetrieval from './sections/resourceRetrieval';
 import memberManagement from './sections/memberManagement';
 import dataQuality from './sections/dataQuality';
 import safetySpecification from './sections/safetySpecification';
+import backups from './sections/backups';
 const App = props => {
     const { projectName } = props
 
@@ -31,6 +32,7 @@ const App = props => {
                 dataQuality,
                 safetySpecification,
                 memberManagement,
+                backups
             ]}
         />
     )

web/client/src/sections/backups/actions/index.js

@@ -0,0 +1,6 @@
+'use strict';
+
+import * as member from './member';
+export default {
+    ...member
+}

web/client/src/sections/backups/actions/member.js

@@ -0,0 +1,56 @@
+'use strict';
+
+import { basicAction } from '@peace/utils'
+import { ApiTable } from '$utils'
+
+export function getUserList(query) {
+    return dispatch => basicAction({
+        type: 'get',
+        dispatch: dispatch,
+        query: query || {},
+        actionType: 'GET_MEMBER_REPORT',
+        url: `${ApiTable.getUserList}`,
+        msg: { error: '获取用户列表失败' },
+        reducer: { name: 'member' }
+    });
+}
+
+
+export function addUser(params) {
+    return (dispatch) => basicAction({
+        type: 'post',
+        data: params,
+        dispatch,
+        actionType: 'ADD_MEMBER_REPORT',
+        url: ApiTable.addUser,
+        msg: {
+            option: '用户新增',
+        },
+    });
+}
+
+export function deleteUser(id) {
+    return (dispatch) => basicAction({
+        type: 'del',
+        dispatch,
+        actionType: 'DELETE_MEMBER_REPORT',
+        url: ApiTable.modifyUser.replace('{id}', id),
+        msg: {
+            option: '用户删除',
+        },
+    });
+}
+
+export function modifyUser(id, params, msg) {
+    return (dispatch) => basicAction({
+        type: 'put',
+        data: params,
+        dispatch,
+        actionType: 'MODIFY_MEMBER_REPORT',
+        url: ApiTable.modifyUser.replace('{id}', id),
+        msg: {
+            option: msg || '用户编辑',
+        },
+    });
+}
+

web/client/src/sections/backups/actions/task.js

@@ -0,0 +1,69 @@
+'use strict';
+
+import { basicAction } from '@peace/utils'
+import { ApiTable } from '$utils'
+
+export function addTask(params, msg) {
+    return (dispatch) => basicAction({
+        type: 'post',
+        data: params,
+        dispatch,
+        actionType: 'ADD_ACQ_TASK',
+        url: ApiTable.addTask,
+        msg: {
+            option: msg || '新增采集任务',
+        },
+    });
+}
+
+export function getTasks(query) {
+    return dispatch => basicAction({
+        type: 'get',
+        dispatch: dispatch,
+        query: query || {},
+        actionType: 'GET_ACQ_TASKS',
+        url: `${ApiTable.getTasks}`,
+        msg: { error: '获取采集任务列表失败' },
+        reducer: { name: 'tasks' }
+    });
+}
+
+export function deleteTask(id) {
+    return (dispatch) => basicAction({
+        type: 'del',
+        dispatch,
+        actionType: 'DELETE_ACQ_TASK',
+        url: ApiTable.modifyTask.replace('{id}', id),
+        msg: {
+            option: '采集任务删除',
+        },
+    });
+}
+
+export function modifyTask(id, params, msg) {
+    return (dispatch) => basicAction({
+        type: 'put',
+        data: params,
+        dispatch,
+        actionType: 'MODIFY_ACQ_TASK',
+        url: ApiTable.modifyTask.replace('{id}', id),
+        msg: {
+            option: msg || '采集任务编辑',
+        },
+    });
+}
+
+export function runTask(params, msg) {
+    return (dispatch) => basicAction({
+        type: 'post',
+        data: params,
+        dispatch,
+        actionType: 'RUN_ACQ_TASK',
+        url: ApiTable.runTask,
+        msg: {
+            option: msg || '任务执行',
+        },
+    });
+}
+
+

web/client/src/sections/backups/components/memberModal.js

@@ -0,0 +1,78 @@
+import React, { useRef } from 'react';
+import { Button, Form } from 'antd';
+import { InfoCircleOutlined } from '@ant-design/icons';
+import {
+    ModalForm,
+    ProFormSelect,
+    ProFormTextArea,
+    ProFormDigit,
+    ProFormText,
+    ProFormSwitch
+} from '@ant-design/pro-form';
+
+export default (props) => {
+    const { title, triggerRender, editData = null, onFinish, paramsName } = props;
+    const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 16 } };
+    const initialValues = editData ? {
+        ...editData,
+    } : {};
+    const [form] = Form.useForm();
+    const formRef = useRef();
+    return (
+        <ModalForm
+            formRef={formRef}
+            title={title || ''}
+            initialValues={initialValues}
+            trigger={
+                triggerRender ? triggerRender : <Button type="primary" >
+                    {title || ''}
+                </Button>
+            }
+            layout="horizontal"
+            grid={true}
+            {...formItemLayout}
+            modalProps={{
+                destroyOnClose: true,
+                onCancel: () => { },
+            }}
+            onFinish={async (values) => {
+                return onFinish && await onFinish(values, editData, form)
+                // return true;
+            }}
+            width={500}
+        >
+            <ProFormText
+                rules={[{ required: true, message: '请输入姓名' },
+                { max: 255, message: '姓名长度不能大于255个字符' },
+                ]}
+                name="name"
+                label="姓名"
+            />
+
+            <ProFormText
+                rules={[{ required: true, message: '请输入用户名' },
+                { max: 255, message: '用户名长度不能大于255个字符' },
+                ]}
+                name="username"
+                label="用户名"
+            />
+
+            <ProFormSelect
+                disabled={editData}
+                rules={[{ required: true, message: '请选择角色' }]}
+                options={[
+                    { label: '系统管理员', value: '系统管理员' },
+                    { label: '数据消费者', value: '数据消费者' },
+                ]}
+                name="role"
+                label="角色"
+            />
+
+            <ProFormSwitch name="enabled" label="是否启用"
+                fieldProps={
+                    { defaultChecked: true }
+                }
+            />
+        </ModalForm>
+    );
+};

web/client/src/sections/backups/components/resetPassword.js

@@ -0,0 +1,61 @@
+import React, { useRef } from 'react';
+import { Button, Form } from 'antd';
+import {
+    ModalForm,
+    ProFormText,
+} from '@ant-design/pro-form';
+
+export default (props) => {
+    const { title, triggerRender, editData = null, onFinish } = props;
+    const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 16 } };
+    const initialValues = {};
+    const [form] = Form.useForm();
+    const formRef = useRef();
+    return (
+        <ModalForm
+            formRef={formRef}
+            title={title || ''}
+            initialValues={initialValues}
+            trigger={
+                triggerRender ? triggerRender : <Button type="primary" >
+                    {title || ''}
+                </Button>
+            }
+            layout="horizontal"
+            grid={true}
+            {...formItemLayout}
+            modalProps={{
+                destroyOnClose: true,
+                onCancel: () => { },
+            }}
+            onFinish={async (values) => {
+                return onFinish && await onFinish({ ...values, msg: '重置密码' }, editData, '重置密码')
+            }}
+            width={500}
+        >
+            <ProFormText.Password
+                rules={[{ required: true, message: '请输入旧密码' },
+                { max: 255, message: '旧密码长度不能大于255个字符' },
+                {
+                    pattern: /^[a-z0-9A-Z]{6,20}$/, message: '密码由6-20位字母或数字组成'
+                },
+                ]}
+                name="oldpassword"
+                label="旧密码"
+            />
+
+            <ProFormText.Password
+                rules={[{ required: true, message: '请输入新密码' },
+                { max: 255, message: '新密码长度不能大于255个字符' },
+                {
+                    pattern: /^[a-z0-9A-Z]{6,20}$/, message: '密码由6-20位字母或数字组成'
+                },
+                ]}
+                name="password"
+                label="新密码"
+            />
+
+
+        </ModalForm>
+    );
+};

web/client/src/sections/backups/components/style.less

@@ -0,0 +1,6 @@
+.step-footer {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 20px;
+    width: 100%;
+}

web/client/src/sections/backups/components/taskModal.js

@@ -0,0 +1,26 @@
+import React, { useEffect, useState } from 'react'
+import { Tabs, Card, Modal } from 'antd'
+import AdapterStep from './adapterStep';
+import { STEP_CONFIG } from './steps/index'
+function DataSourceModal(props) {
+    const { visible, editData, onFinish, onCancel,
+        type = 'postgre',//当前卡片的key （目前只有postgre,支持后续扩展）
+        dataSourceFilter,
+    } = props;
+    const { StepThree } = STEP_CONFIG[type];
+    // const onFinish = () => { }
+    return <>
+        <Modal
+            title={editData ? '编辑采集任务' : "新建采集任务"}
+            onCancel={() => { onCancel() }}
+            open={visible}
+            footer={null}
+            width={1200}
+            destroyOnClose={true}
+        >
+            <StepThree next={onFinish} dataSourceFilter={dataSourceFilter} editData={editData} />
+        </Modal>
+    </>
+}
+
+export default DataSourceModal

web/client/src/sections/backups/containers/index.js

@@ -0,0 +1,5 @@
+'use strict';
+
+import Restore from './restore';
+
+export { Restore };

web/client/src/sections/backups/containers/restore.js

@@ -0,0 +1,229 @@
+import React, { useEffect, useState } from 'react'
+import { Spin, Popconfirm, Select, Row, Col, Button, Input, Table } from 'antd';
+import { connect } from 'react-redux';
+import ProTable from '@ant-design/pro-table';
+import moment from 'moment';
+import MemberModal from '../components/memberModal';
+import ResetPasswordModal from '../components/resetPassword';
+import { useFsRequest, ApiTable } from '$utils';
+import './style.less';
+function Member(props) {
+    const { loading, clientHeight, actions, dispatch, member, user } = props;
+    const [pageSize, setPageSize] = useState(10);
+    const [currentPage, setCurrentPage] = useState(1);
+    const [searchValue, setSearchValue] = useState('')
+    const [visible, setVisible] = useState(false);//是否展示新增编辑模态框
+    const [editData, setEditData] = useState(null);//模态框编辑数据
+    const [refreshTree, setRefreshTree] = useState(1);
+    const [searchRole, setSearchRole] = useState()
+    const queryData = (search) => {
+        const query = {
+            limit: search ? 10 : pageSize || 10,
+            page: search ? 1 : currentPage || 1,
+            name: searchValue,
+            role: searchRole
+        }
+
+        dispatch(actions.memberManagement.getUserList(query));
+    }
+    const { data: treeData = [] } = useFsRequest({
+        url: ApiTable.getResourceCatalog,
+        refreshDeps: [refreshTree]
+    });
+
+    useEffect(() => {
+        queryData();
+    }, [pageSize, currentPage]);
+
+    const columns = [
+        {
+            title: '序号',
+            dataIndex: 'index',
+            render: (text, record, index) => { return index + 1 }
+        },
+        {
+            title: '姓名',
+            dataIndex: 'name',
+        },
+        {
+            title: '用户名',
+            dataIndex: 'username',
+        },
+        {
+            title: '角色',
+            dataIndex: 'role',
+        },
+        {
+            title: '状态',
+            dataIndex: 'enabled',
+            render: (text, record) => {
+                return <span style={{ color: record?.enabled ? '#87d068' : '#f50' }}>● {record?.enabled ? '正常' : '禁用'}</span>
+            }
+        },
+        {
+            title: '操作',
+            width: 160,
+            key: 'option',
+            valueType: 'option',
+            render: (text, record) => {
+                const options = [];
+                options.push(<MemberModal
+                    editData={record}
+                    triggerRender={<a>编辑</a>}
+                    title="编辑用户"
+                    onFinish={onFinish}
+                    key="editUser"
+                />)
+                options.push(
+                    <Popconfirm
+                        key="del"
+                        placement="top"
+                        title={<><div>是否确认删除该用户？</div>
+                        </>}
+                        onConfirm={() => handleDelete(record.id)}
+                        okText="是"
+                        cancelText="否"
+                    >
+                        <a>删除</a>
+                    </Popconfirm>)
+                user?.username == 'SuperAdmin' && options.push(
+                    <Popconfirm
+                        key="del"
+                        placement="top"
+                        title={<><div>是否确认重置该用户密码？</div>
+                        </>}
+                        onConfirm={() => {
+                            dispatch(actions.memberManagement.modifyUser(record.id, { password: 'e10adc3949ba59abbe56e057f20f883e' }, '重置密码'))
+                        }}
+                        okText="是"
+                        cancelText="否"
+                    >
+                        <a>重置密码</a>
+                    </Popconfirm>)
+
+
+                return options;
+
+            },
+        },
+    ];
+
+    const handleDelete = (id) => {
+        dispatch(actions.memberManagement.deleteUser(id)).then(() => {
+            queryData();
+        });
+    };
+
+    const onFinish = async (values, editData) => {
+        if (editData) {
+            const dataToSave = { ...values }
+            return dispatch(
+                actions.memberManagement.modifyUser(editData.id, dataToSave, values?.msg || ''),
+            ).then((res) => {
+                if (res.success) {
+                    queryData();
+                    return true;
+                } else {
+                    return false;
+                }
+            });
+        }
+
+        return dispatch(actions.memberManagement.addUser({
+            ...values,
+        })).then(res => {
+            if (res.success) {
+                queryData();
+                return true;
+            } else {
+                return false;
+            }
+        });
+    };
+
+    return <Spin spinning={loading}>
+        <Row className='protable-title'>
+            <Col span={12}>
+                <MemberModal
+                    triggerRender={<Button type='primary'>新建</Button>}
+                    title="新建用户"
+                    onFinish={onFinish}
+                    key="addModel"
+                />
+            </Col>
+            <Col span={12} style={{ display: 'flex', justifyContent: 'flex-end', alignItems: 'center' }}>
+                <span>用户姓名： </span> <Input
+                    value={searchValue} onChange={e => { setSearchValue(e.target.value) }}
+                    style={{ width: 220, marginRight: 15 }} placeholder="请输入" />
+
+                <span>角色： </span> <Select
+                    allowClear
+                    value={searchRole} onChange={e => { setSearchRole(e) }}
+                    style={{ width: 220, marginRight: 15 }} placeholder="请选择" >
+                    <Select.Option value={'系统管理员'}>系统管理员</Select.Option>
+                    <Select.Option value={'数据消费者'}>数据消费者</Select.Option>
+                </Select>
+
+                <Button onClick={() => {
+                    setCurrentPage(1)
+                    setPageSize(10)
+                    queryData(true)
+                }} type='primary'>查询</Button></Col>
+
+        </Row>
+        <ProTable
+            columns={columns}
+            dateFormatter="string"
+            search={false}
+            scroll={
+                {
+                    scrollToFirstRowOnChange: true,
+                    y: clientHeight - 260
+                }
+            }
+            pagination={{
+                size: 'large',
+                total: member?.count,
+                showSizeChanger: true,
+                showQuickJumper: true,
+                current: currentPage,
+                pageSize: pageSize || 10,
+                defaultPageSize: 10,
+                pageSizeOptions: [10, 20, 50],
+                showTotal: (total) => {
+                    return <span style={{ fontSize: 15 }}>{`共${Math.ceil(total / pageSize)}页，${total}项`}</span>
+                },
+                onShowSizeChange: (currentPage, pageSize) => {
+                    setCurrentPage(currentPage);
+                    setPageSize(pageSize);
+
+                },
+                onChange: (page, pageSize) => {
+                    setCurrentPage(page);
+                    setPageSize(pageSize);
+                }
+            }}
+            dataSource={member?.rows || []}
+            options={false}
+        />
+    </Spin>
+
+}
+
+function mapStateToProps(state) {
+    const {
+        auth, global, datasources, member
+    } = state;
+    return {
+        loading: datasources.isRequesting,
+        clientHeight: global.clientHeight,
+        actions: global.actions,
+        member: member?.data || {},
+        user: auth.user
+    };
+}
+
+export default connect(mapStateToProps)(Member);
+
+
+

web/client/src/sections/backups/containers/style.less

@@ -0,0 +1,5 @@
+.protable-title {
+    margin-bottom: 16px;
+    padding-left: 24px;
+    padding-right: 24px;
+}

web/client/src/sections/backups/index.js

@@ -0,0 +1,15 @@
+'use strict';
+
+import reducers from './reducers';
+import routes from './routes';
+import actions from './actions';
+import { getNavItem } from './nav-item';
+
+export default {
+    key: 'backups',
+    name: '数据备份恢复',
+    reducers: reducers,
+    routes: routes,
+    actions: actions,
+    getNavItem: getNavItem
+};

web/client/src/sections/backups/nav-item.js

@@ -0,0 +1,17 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { Menu } from 'antd';
+import { BarChartOutlined } from '@ant-design/icons';
+const SubMenu = Menu.SubMenu;
+
+export function getNavItem(user) {
+
+    return (
+        user?.role == '系统管理员' && <SubMenu key="数据备份恢复" icon={<BarChartOutlined />} title='数据备份恢复'>
+            <Menu.Item key="backups">
+                <Link to="/backups/restore">备份恢复</Link>
+            </Menu.Item>
+        </ SubMenu >
+    )
+
+}

web/client/src/sections/backups/reducers/index.js

@@ -0,0 +1,5 @@
+'use strict';
+
+export default {
+
+}

web/client/src/sections/backups/routes.js

@@ -0,0 +1,18 @@
+'use strict';
+import { Restore } from './containers';
+export default [{
+    type: 'inner',
+    route: {
+        path: '/backups',
+        key: 'backups',
+        breadcrumb: '用户管理',
+        // 不设置 component 则面包屑禁止跳转
+        childRoutes: [{
+            path: '/restore',
+            key: 'restore',
+            component: Restore,
+            breadcrumb: '备份恢复'
+        }]
+    }
+}];
+

web/client/src/sections/memberManagement/containers/index.js

@@ -1,5 +1,5 @@
 'use strict';
 
-import DataSourceManagement from './member';
+import MemberManagement from './member';
 
-export { DataSourceManagement };
+export { MemberManagement };

web/client/src/sections/memberManagement/routes.js

@@ -1,5 +1,5 @@
 'use strict';
-import { Adapter, DataSourceManagement, AcquisitionTask, AcquisitionLog, AdapterDetail } from './containers';
+import { MemberManagement } from './containers';
 export default [{
     type: 'inner',
     route: {
@@ -10,7 +10,7 @@ export default [{
         childRoutes: [{
             path: '/auth',
             key: 'auth',
-            component: DataSourceManagement,
+            component: MemberManagement,
             breadcrumb: '权限管理'
         }]
     }