From bdb48eded583e163656a73890c0c6f07c366ac26 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 二月 2025 13:03:59 +0800
Subject: [PATCH] #新增 1. 新增编码规则主表界面 2. 新增编码规则子表界面
---
rsf-admin/src/page/serialRuleItem/SerialRuleItemEdit.jsx | 123 +++
rsf-server/src/main/java/com/vincent/rsf/server/system/service/SerialRuleService.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/system/service/SerialRuleItemService.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/SerialRuleServiceImpl.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleItemController.java | 110 +++
rsf-admin/src/page/serialRule/SerialRuleEdit.jsx | 133 +++
rsf-admin/src/page/serialRuleItem/SerialRuleItemCreate.jsx | 151 ++++
rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/SerialRuleItemMapper.java | 12
rsf-server/src/main/resources/mapper/system/SerialRuleItemMapper.xml | 5
rsf-admin/src/page/serialRule/SerialRuleList.jsx | 164 ++++
rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/SerialRuleMapper.java | 12
rsf-server/src/main/java/serialRule.sql | 28
rsf-admin/src/i18n/zh.js | 21
rsf-admin/src/i18n/en.js | 21
rsf-admin/src/page/ResourceContent.js | 6
rsf-server/src/main/resources/mapper/system/SerialRuleMapper.xml | 5
rsf-admin/src/page/serialRule/SerialRulePanel.jsx | 93 ++
rsf-admin/src/page/serialRuleItem/SerialRuleItemPanel.jsx | 87 ++
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleController.java | 110 +++
rsf-server/src/main/java/serialRuleItem.sql | 27
rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/SerialRuleItemServiceImpl.java | 12
rsf-admin/src/page/serialRuleItem/SerialRuleItemList.jsx | 162 ++++
rsf-admin/src/page/serialRule/SerialRuleCreate.jsx | 161 ++++
rsf-admin/src/page/serialRule/index.jsx | 18
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java | 240 +++++++
rsf-admin/src/page/serialRuleItem/index.jsx | 18
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java | 234 ++++++
28 files changed, 1,980 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index e65bfbb..ab3b631 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -133,8 +133,8 @@
dictType: 'DictType',
dictData: 'DictData',
companys: 'Companys',
-
-
+ serialRuleItem: 'SerialRuleItem',
+ serialRule: 'SerialRule',
},
table: {
@@ -369,6 +369,23 @@
city: "City",
address: "Address",
},
+ serialRuleItem: {
+ ruleId: "ruleId",
+ wkType: "wkType",
+ feildValue: "feildValue",
+ len: "len",
+ lenStr: "lenStr",
+ sort: "sort",
+ },
+ serialRule: {
+ code: "code",
+ name: "name",
+ delimit: "delimit",
+ reset: "reset",
+ resetDep: "resetDep",
+ currValue: "currValue",
+ lastCode: "lastCode",
+ },
}
},
page: {
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index c617d17..e494ac2 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -133,7 +133,8 @@
dictType: '鏁版嵁瀛楀吀',
dictData: '瀛楀吀鏁版嵁闆�',
companys: '寰�鏉ヤ紒涓�',
-
+ serialRuleItem: '缂栫爜瑙勫垯瀛愯〃',
+ serialRule: '缂栫爜瑙勫垯',
},
table: {
@@ -369,7 +370,23 @@
city: "鍩庡競",
address: "鍦板潃",
},
-
+ serialRuleItem: {
+ ruleId: "瑙勫垯鏍囪瘑",
+ wkType: "瑙勫垯绫诲瀷",
+ feildValue: "瑙勫垯鍙傛暟",
+ len: "鎴彇闀垮害",
+ lenStr: "鎴彇璧峰浣嶇疆",
+ sort: "鎺掑簭",
+ },
+ serialRule: {
+ code: "瑙勫垯缂栫爜",
+ name: "瑙勫垯鍚嶇О",
+ delimit: "鍒嗛殧绗�",
+ reset: "閲嶇疆瑙勫垯",
+ resetDep: "閲嶇疆渚濊禆",
+ currValue: "褰撳墠娴佹按鍙�",
+ lastCode: "鏈�杩戠敓鎴愮紪鐮�",
+ },
}
},
page: {
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 43069ae..5a97f65 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -24,6 +24,8 @@
import dictType from './dictType';
import dictData from './dictData';
import companys from './basicInfo/companys';
+import serialRuleItem from './serialRuleItem';
+import serialRule from './serialRule';
const ResourceContent = (node) => {
@@ -68,6 +70,10 @@
return dictData;
case 'companys':
return companys;
+ case 'serialRuleItem':
+ return serialRuleItem;
+ case 'serialRule':
+ return serialRule;
default:
return {
list: ListGuesser,
diff --git a/rsf-admin/src/page/serialRule/SerialRuleCreate.jsx b/rsf-admin/src/page/serialRule/SerialRuleCreate.jsx
new file mode 100644
index 0000000..4bbdfbe
--- /dev/null
+++ b/rsf-admin/src/page/serialRule/SerialRuleCreate.jsx
@@ -0,0 +1,161 @@
+import React, { useState, useRef, useEffect, useMemo } from "react";
+import {
+ CreateBase,
+ useTranslate,
+ TextInput,
+ NumberInput,
+ BooleanInput,
+ DateInput,
+ SaveButton,
+ SelectInput,
+ ReferenceInput,
+ ReferenceArrayInput,
+ AutocompleteInput,
+ Toolbar,
+ required,
+ useDataProvider,
+ useNotify,
+ Form,
+ useCreateController,
+} from 'react-admin';
+import {
+ Dialog,
+ DialogActions,
+ DialogContent,
+ DialogTitle,
+ Stack,
+ Grid,
+ Box,
+} from '@mui/material';
+import DialogCloseButton from "../components/DialogCloseButton";
+import StatusSelectInput from "../components/StatusSelectInput";
+import MemoInput from "../components/MemoInput";
+
+const SerialRuleCreate = (props) => {
+ const { open, setOpen } = props;
+
+ const translate = useTranslate();
+ const notify = useNotify();
+
+ const handleClose = (event, reason) => {
+ if (reason !== "backdropClick") {
+ setOpen(false);
+ }
+ };
+
+ const handleSuccess = async (data) => {
+ setOpen(false);
+ notify('common.response.success');
+ };
+
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
+ };
+
+ return (
+ <>
+ <CreateBase
+ record={{}}
+ transform={(data) => {
+ return data;
+ }}
+ mutationOptions={{ onSuccess: handleSuccess, onError: handleError }}
+ >
+ <Dialog
+ open={open}
+ onClose={handleClose}
+ aria-labelledby="form-dialog-title"
+ fullWidth
+ disableRestoreFocus
+ maxWidth="md" // 'xs' | 'sm' | 'md' | 'lg' | 'xl'
+ >
+ <Form>
+ <DialogTitle id="form-dialog-title" sx={{
+ position: 'sticky',
+ top: 0,
+ backgroundColor: 'background.paper',
+ zIndex: 1000
+ }}
+ >
+ {translate('create.title')}
+ <Box sx={{ position: 'absolute', top: 8, right: 8, zIndex: 1001 }}>
+ <DialogCloseButton onClose={handleClose} />
+ </Box>
+ </DialogTitle>
+ <DialogContent sx={{ mt: 2 }}>
+ <Grid container rowSpacing={2} columnSpacing={2}>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.serialRule.code"
+ source="code"
+ parse={v => v}
+ autoFocus
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.serialRule.name"
+ source="name"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.serialRule.delimit"
+ source="delimit"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.serialRule.reset"
+ source="reset"
+ parse={v => v}
+ validate={required()}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.serialRule.resetDep"
+ source="resetDep"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.serialRule.currValue"
+ source="currValue"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.serialRule.lastCode"
+ source="lastCode"
+ parse={v => v}
+ />
+ </Grid>
+
+ <Grid item xs={6} display="flex" gap={1}>
+ <StatusSelectInput />
+ </Grid>
+ <Grid item xs={12} display="flex" gap={1}>
+ <Stack direction="column" spacing={1} width={'100%'}>
+ <MemoInput />
+ </Stack>
+ </Grid>
+ </Grid>
+ </DialogContent>
+ <DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
+ <Toolbar sx={{ width: '100%', justifyContent: 'space-between' }} >
+ <SaveButton />
+ </Toolbar>
+ </DialogActions>
+ </Form>
+ </Dialog>
+ </CreateBase>
+ </>
+ )
+}
+
+export default SerialRuleCreate;
diff --git a/rsf-admin/src/page/serialRule/SerialRuleEdit.jsx b/rsf-admin/src/page/serialRule/SerialRuleEdit.jsx
new file mode 100644
index 0000000..2b03b81
--- /dev/null
+++ b/rsf-admin/src/page/serialRule/SerialRuleEdit.jsx
@@ -0,0 +1,133 @@
+import React, { useState, useRef, useEffect, useMemo } from "react";
+import {
+ Edit,
+ SimpleForm,
+ FormDataConsumer,
+ useTranslate,
+ TextInput,
+ NumberInput,
+ BooleanInput,
+ DateInput,
+ SelectInput,
+ ReferenceInput,
+ ReferenceArrayInput,
+ AutocompleteInput,
+ SaveButton,
+ Toolbar,
+ Labeled,
+ NumberField,
+ required,
+ useRecordContext,
+ DeleteButton,
+} from 'react-admin';
+import { useWatch, useFormContext } from "react-hook-form";
+import { Stack, Grid, Box, Typography } from '@mui/material';
+import * as Common from '@/utils/common';
+import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting';
+import EditBaseAside from "../components/EditBaseAside";
+import CustomerTopToolBar from "../components/EditTopToolBar";
+import MemoInput from "../components/MemoInput";
+import StatusSelectInput from "../components/StatusSelectInput";
+
+const FormToolbar = () => {
+ const { getValues } = useFormContext();
+
+ return (
+ <Toolbar sx={{ justifyContent: 'space-between' }}>
+ <SaveButton />
+ <DeleteButton mutationMode="optimistic" />
+ </Toolbar>
+ )
+}
+
+const SerialRuleEdit = () => {
+ const translate = useTranslate();
+
+ return (
+ <Edit
+ redirect="list"
+ mutationMode={EDIT_MODE}
+ actions={<CustomerTopToolBar />}
+ aside={<EditBaseAside />}
+ >
+ <SimpleForm
+ shouldUnregister
+ warnWhenUnsavedChanges
+ toolbar={<FormToolbar />}
+ mode="onTouched"
+ defaultValues={{}}
+ // validate={(values) => { }}
+ >
+ <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
+ <Grid item xs={12} md={8}>
+ <Typography variant="h6" gutterBottom>
+ {translate('common.edit.title.main')}
+ </Typography>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.serialRule.code"
+ source="code"
+ parse={v => v}
+ autoFocus
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.serialRule.name"
+ source="name"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.serialRule.delimit"
+ source="delimit"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.serialRule.reset"
+ source="reset"
+ parse={v => v}
+ validate={required()}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.serialRule.resetDep"
+ source="resetDep"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.serialRule.currValue"
+ source="currValue"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.serialRule.lastCode"
+ source="lastCode"
+ parse={v => v}
+ />
+ </Stack>
+
+ </Grid>
+ <Grid item xs={12} md={4}>
+ <Typography variant="h6" gutterBottom>
+ {translate('common.edit.title.common')}
+ </Typography>
+ <StatusSelectInput />
+ <Box mt="2em" />
+ <MemoInput />
+ </Grid>
+ </Grid>
+ </SimpleForm>
+ </Edit >
+ )
+}
+
+export default SerialRuleEdit;
diff --git a/rsf-admin/src/page/serialRule/SerialRuleList.jsx b/rsf-admin/src/page/serialRule/SerialRuleList.jsx
new file mode 100644
index 0000000..ffd2505
--- /dev/null
+++ b/rsf-admin/src/page/serialRule/SerialRuleList.jsx
@@ -0,0 +1,164 @@
+import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
+import { useNavigate } from 'react-router-dom';
+import {
+ List,
+ DatagridConfigurable,
+ SearchInput,
+ TopToolbar,
+ SelectColumnsButton,
+ EditButton,
+ FilterButton,
+ CreateButton,
+ ExportButton,
+ BulkDeleteButton,
+ WrapperField,
+ useRecordContext,
+ useTranslate,
+ useNotify,
+ useListContext,
+ FunctionField,
+ TextField,
+ NumberField,
+ DateField,
+ BooleanField,
+ ReferenceField,
+ TextInput,
+ DateTimeInput,
+ DateInput,
+ SelectInput,
+ NumberInput,
+ ReferenceInput,
+ ReferenceArrayInput,
+ AutocompleteInput,
+ DeleteButton,
+} from 'react-admin';
+import { Box, Typography, Card, Stack } from '@mui/material';
+import { styled } from '@mui/material/styles';
+import SerialRuleCreate from "./SerialRuleCreate";
+import SerialRulePanel from "./SerialRulePanel";
+import EmptyData from "../components/EmptyData";
+import MyCreateButton from "../components/MyCreateButton";
+import MyExportButton from '../components/MyExportButton';
+import PageDrawer from "../components/PageDrawer";
+import MyField from "../components/MyField";
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
+import * as Common from '@/utils/common';
+
+const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
+ '& .css-1vooibu-MuiSvgIcon-root': {
+ height: '.9em'
+ },
+ '& .RaDatagrid-row': {
+ cursor: 'auto'
+ },
+ '& .column-name': {
+ },
+ '& .opt': {
+ width: 200
+ },
+}));
+
+const filters = [
+ <SearchInput source="condition" alwaysOn />,
+ <DateInput label='common.time.after' source="timeStart" alwaysOn />,
+ <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
+
+ <TextInput source="code" label="table.field.serialRule.code" />,
+ <TextInput source="name" label="table.field.serialRule.name" />,
+ <TextInput source="delimit" label="table.field.serialRule.delimit" />,
+ <TextInput source="reset" label="table.field.serialRule.reset" />,
+ <TextInput source="resetDep" label="table.field.serialRule.resetDep" />,
+ <TextInput source="currValue" label="table.field.serialRule.currValue" />,
+ <TextInput source="lastCode" label="table.field.serialRule.lastCode" />,
+
+ <TextInput label="common.field.memo" source="memo" />,
+ <SelectInput
+ label="common.field.status"
+ source="status"
+ choices={[
+ { id: '1', name: 'common.enums.statusTrue' },
+ { id: '0', name: 'common.enums.statusFalse' },
+ ]}
+ resettable
+ />,
+]
+
+const SerialRuleList = () => {
+ const translate = useTranslate();
+
+ const [createDialog, setCreateDialog] = useState(false);
+ const [drawerVal, setDrawerVal] = useState(false);
+
+ return (
+ <Box display="flex">
+ <List
+ sx={{
+ flexGrow: 1,
+ transition: (theme) =>
+ theme.transitions.create(['all'], {
+ duration: theme.transitions.duration.enteringScreen,
+ }),
+ marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+ }}
+ title={"menu.serialRule"}
+ empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ filters={filters}
+ sort={{ field: "create_time", order: "desc" }}
+ actions={(
+ <TopToolbar>
+ <FilterButton />
+ <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ <SelectColumnsButton preferenceKey='serialRule' />
+ <MyExportButton />
+ </TopToolbar>
+ )}
+ perPage={DEFAULT_PAGE_SIZE}
+ >
+ <StyledDatagrid
+ preferenceKey='serialRule'
+ bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ rowClick={(id, resource, record) => false}
+ expand={() => <SerialRulePanel />}
+ expandSingle={true}
+ omit={['id', 'createTime', 'createBy', 'memo']}
+ >
+ <NumberField source="id" />
+ <TextField source="code" label="table.field.serialRule.code" />
+ <TextField source="name" label="table.field.serialRule.name" />
+ <TextField source="delimit" label="table.field.serialRule.delimit" />
+ <TextField source="reset" label="table.field.serialRule.reset" />
+ <TextField source="resetDep" label="table.field.serialRule.resetDep" />
+ <TextField source="currValue" label="table.field.serialRule.currValue" />
+ <TextField source="lastCode" label="table.field.serialRule.lastCode" />
+
+ <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>
+ <DateField source="updateTime" label="common.field.updateTime" showTime />
+ <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>
+ <DateField source="createTime" label="common.field.createTime" showTime />
+ <BooleanField source="statusBool" label="common.field.status" sortable={false} />
+ <TextField source="memo" label="common.field.memo" sortable={false} />
+ <WrapperField cellClassName="opt" label="common.field.opt">
+ <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
+ <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ </WrapperField>
+ </StyledDatagrid>
+ </List>
+ <SerialRuleCreate
+ open={createDialog}
+ setOpen={setCreateDialog}
+ />
+ <PageDrawer
+ title='SerialRule Detail'
+ drawerVal={drawerVal}
+ setDrawerVal={setDrawerVal}
+ >
+ </PageDrawer>
+ </Box>
+ )
+}
+
+export default SerialRuleList;
diff --git a/rsf-admin/src/page/serialRule/SerialRulePanel.jsx b/rsf-admin/src/page/serialRule/SerialRulePanel.jsx
new file mode 100644
index 0000000..e3a0a7f
--- /dev/null
+++ b/rsf-admin/src/page/serialRule/SerialRulePanel.jsx
@@ -0,0 +1,93 @@
+import React, { useState, useRef, useEffect, useMemo } from "react";
+import { Box, Card, CardContent, Grid, Typography, Tooltip } from '@mui/material';
+import {
+ useTranslate,
+ useRecordContext,
+} from 'react-admin';
+import PanelTypography from "../components/PanelTypography";
+import * as Common from '@/utils/common'
+
+const SerialRulePanel = () => {
+ const record = useRecordContext();
+ if (!record) return null;
+ const translate = useTranslate();
+ return (
+ <>
+ <Card sx={{ width: { xs: 300, sm: 500, md: 600, lg: 800 }, margin: 'auto' }}>
+ <CardContent>
+ <Grid container spacing={2}>
+ <Grid item xs={12} sx={{ display: 'flex', justifyContent: 'space-between' }}>
+ <Typography variant="h6" gutterBottom align="left" sx={{
+ maxWidth: { xs: '100px', sm: '180px', md: '260px', lg: '360px' },
+ whiteSpace: 'nowrap',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ }}>
+ {Common.camelToPascalWithSpaces(translate('table.field.serialRule.code'))}: {record.code}
+ </Typography>
+ {/* inherit, primary, secondary, textPrimary, textSecondary, error */}
+ <Typography variant="h6" gutterBottom align="right" >
+ ID: {record.id}
+ </Typography>
+ </Grid>
+ </Grid>
+ <Grid container spacing={2}>
+ <Grid item xs={12} container alignContent="flex-end">
+ <Typography variant="caption" color="textSecondary" sx={{ wordWrap: 'break-word', wordBreak: 'break-all' }}>
+ {Common.camelToPascalWithSpaces(translate('common.field.memo'))}:{record.memo}
+ </Typography>
+ </Grid>
+ </Grid>
+ <Box height={20}> </Box>
+ <Grid container spacing={2}>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.serialRule.code"
+ property={record.code}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.serialRule.name"
+ property={record.name}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.serialRule.delimit"
+ property={record.delimit}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.serialRule.reset"
+ property={record.reset$}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.serialRule.resetDep"
+ property={record.resetDep}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.serialRule.currValue"
+ property={record.currValue}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.serialRule.lastCode"
+ property={record.lastCode}
+ />
+ </Grid>
+
+ </Grid>
+ </CardContent>
+ </Card >
+ </>
+ );
+};
+
+export default SerialRulePanel;
diff --git a/rsf-admin/src/page/serialRule/index.jsx b/rsf-admin/src/page/serialRule/index.jsx
new file mode 100644
index 0000000..ce38338
--- /dev/null
+++ b/rsf-admin/src/page/serialRule/index.jsx
@@ -0,0 +1,18 @@
+import React, { useState, useRef, useEffect, useMemo } from "react";
+import {
+ ListGuesser,
+ EditGuesser,
+ ShowGuesser,
+} from "react-admin";
+
+import SerialRuleList from "./SerialRuleList";
+import SerialRuleEdit from "./SerialRuleEdit";
+
+export default {
+ list: SerialRuleList,
+ edit: SerialRuleEdit,
+ show: ShowGuesser,
+ recordRepresentation: (record) => {
+ return `${record.code}`
+ }
+};
diff --git a/rsf-admin/src/page/serialRuleItem/SerialRuleItemCreate.jsx b/rsf-admin/src/page/serialRuleItem/SerialRuleItemCreate.jsx
new file mode 100644
index 0000000..18f73aa
--- /dev/null
+++ b/rsf-admin/src/page/serialRuleItem/SerialRuleItemCreate.jsx
@@ -0,0 +1,151 @@
+import React, { useState, useRef, useEffect, useMemo } from "react";
+import {
+ CreateBase,
+ useTranslate,
+ TextInput,
+ NumberInput,
+ BooleanInput,
+ DateInput,
+ SaveButton,
+ SelectInput,
+ ReferenceInput,
+ ReferenceArrayInput,
+ AutocompleteInput,
+ Toolbar,
+ required,
+ useDataProvider,
+ useNotify,
+ Form,
+ useCreateController,
+} from 'react-admin';
+import {
+ Dialog,
+ DialogActions,
+ DialogContent,
+ DialogTitle,
+ Stack,
+ Grid,
+ Box,
+} from '@mui/material';
+import DialogCloseButton from "../components/DialogCloseButton";
+import StatusSelectInput from "../components/StatusSelectInput";
+import MemoInput from "../components/MemoInput";
+
+const SerialRuleItemCreate = (props) => {
+ const { open, setOpen } = props;
+
+ const translate = useTranslate();
+ const notify = useNotify();
+
+ const handleClose = (event, reason) => {
+ if (reason !== "backdropClick") {
+ setOpen(false);
+ }
+ };
+
+ const handleSuccess = async (data) => {
+ setOpen(false);
+ notify('common.response.success');
+ };
+
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
+ };
+
+ return (
+ <>
+ <CreateBase
+ record={{}}
+ transform={(data) => {
+ return data;
+ }}
+ mutationOptions={{ onSuccess: handleSuccess, onError: handleError }}
+ >
+ <Dialog
+ open={open}
+ onClose={handleClose}
+ aria-labelledby="form-dialog-title"
+ fullWidth
+ disableRestoreFocus
+ maxWidth="md" // 'xs' | 'sm' | 'md' | 'lg' | 'xl'
+ >
+ <Form>
+ <DialogTitle id="form-dialog-title" sx={{
+ position: 'sticky',
+ top: 0,
+ backgroundColor: 'background.paper',
+ zIndex: 1000
+ }}
+ >
+ {translate('create.title')}
+ <Box sx={{ position: 'absolute', top: 8, right: 8, zIndex: 1001 }}>
+ <DialogCloseButton onClose={handleClose} />
+ </Box>
+ </DialogTitle>
+ <DialogContent sx={{ mt: 2 }}>
+ <Grid container rowSpacing={2} columnSpacing={2}>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.serialRuleItem.ruleId"
+ source="ruleId"
+ autoFocus
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.serialRuleItem.wkType"
+ source="wkType"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.serialRuleItem.feildValue"
+ source="feildValue"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.serialRuleItem.len"
+ source="len"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.serialRuleItem.lenStr"
+ source="lenStr"
+ validate={required()}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.serialRuleItem.sort"
+ source="sort"
+ validate={required()}
+ />
+ </Grid>
+
+ <Grid item xs={6} display="flex" gap={1}>
+ <StatusSelectInput />
+ </Grid>
+ <Grid item xs={12} display="flex" gap={1}>
+ <Stack direction="column" spacing={1} width={'100%'}>
+ <MemoInput />
+ </Stack>
+ </Grid>
+ </Grid>
+ </DialogContent>
+ <DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
+ <Toolbar sx={{ width: '100%', justifyContent: 'space-between' }} >
+ <SaveButton />
+ </Toolbar>
+ </DialogActions>
+ </Form>
+ </Dialog>
+ </CreateBase>
+ </>
+ )
+}
+
+export default SerialRuleItemCreate;
diff --git a/rsf-admin/src/page/serialRuleItem/SerialRuleItemEdit.jsx b/rsf-admin/src/page/serialRuleItem/SerialRuleItemEdit.jsx
new file mode 100644
index 0000000..edec115
--- /dev/null
+++ b/rsf-admin/src/page/serialRuleItem/SerialRuleItemEdit.jsx
@@ -0,0 +1,123 @@
+import React, { useState, useRef, useEffect, useMemo } from "react";
+import {
+ Edit,
+ SimpleForm,
+ FormDataConsumer,
+ useTranslate,
+ TextInput,
+ NumberInput,
+ BooleanInput,
+ DateInput,
+ SelectInput,
+ ReferenceInput,
+ ReferenceArrayInput,
+ AutocompleteInput,
+ SaveButton,
+ Toolbar,
+ Labeled,
+ NumberField,
+ required,
+ useRecordContext,
+ DeleteButton,
+} from 'react-admin';
+import { useWatch, useFormContext } from "react-hook-form";
+import { Stack, Grid, Box, Typography } from '@mui/material';
+import * as Common from '@/utils/common';
+import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting';
+import EditBaseAside from "../components/EditBaseAside";
+import CustomerTopToolBar from "../components/EditTopToolBar";
+import MemoInput from "../components/MemoInput";
+import StatusSelectInput from "../components/StatusSelectInput";
+
+const FormToolbar = () => {
+ const { getValues } = useFormContext();
+
+ return (
+ <Toolbar sx={{ justifyContent: 'space-between' }}>
+ <SaveButton />
+ <DeleteButton mutationMode="optimistic" />
+ </Toolbar>
+ )
+}
+
+const SerialRuleItemEdit = () => {
+ const translate = useTranslate();
+
+ return (
+ <Edit
+ redirect="list"
+ mutationMode={EDIT_MODE}
+ actions={<CustomerTopToolBar />}
+ aside={<EditBaseAside />}
+ >
+ <SimpleForm
+ shouldUnregister
+ warnWhenUnsavedChanges
+ toolbar={<FormToolbar />}
+ mode="onTouched"
+ defaultValues={{}}
+ // validate={(values) => { }}
+ >
+ <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
+ <Grid item xs={12} md={8}>
+ <Typography variant="h6" gutterBottom>
+ {translate('common.edit.title.main')}
+ </Typography>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.serialRuleItem.ruleId"
+ source="ruleId"
+ autoFocus
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.serialRuleItem.wkType"
+ source="wkType"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.serialRuleItem.feildValue"
+ source="feildValue"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.serialRuleItem.len"
+ source="len"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.serialRuleItem.lenStr"
+ source="lenStr"
+ validate={required()}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.serialRuleItem.sort"
+ source="sort"
+ validate={required()}
+ />
+ </Stack>
+
+ </Grid>
+ <Grid item xs={12} md={4}>
+ <Typography variant="h6" gutterBottom>
+ {translate('common.edit.title.common')}
+ </Typography>
+ <StatusSelectInput />
+ <Box mt="2em" />
+ <MemoInput />
+ </Grid>
+ </Grid>
+ </SimpleForm>
+ </Edit >
+ )
+}
+
+export default SerialRuleItemEdit;
diff --git a/rsf-admin/src/page/serialRuleItem/SerialRuleItemList.jsx b/rsf-admin/src/page/serialRuleItem/SerialRuleItemList.jsx
new file mode 100644
index 0000000..53aee0c
--- /dev/null
+++ b/rsf-admin/src/page/serialRuleItem/SerialRuleItemList.jsx
@@ -0,0 +1,162 @@
+import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
+import { useNavigate } from 'react-router-dom';
+import {
+ List,
+ DatagridConfigurable,
+ SearchInput,
+ TopToolbar,
+ SelectColumnsButton,
+ EditButton,
+ FilterButton,
+ CreateButton,
+ ExportButton,
+ BulkDeleteButton,
+ WrapperField,
+ useRecordContext,
+ useTranslate,
+ useNotify,
+ useListContext,
+ FunctionField,
+ TextField,
+ NumberField,
+ DateField,
+ BooleanField,
+ ReferenceField,
+ TextInput,
+ DateTimeInput,
+ DateInput,
+ SelectInput,
+ NumberInput,
+ ReferenceInput,
+ ReferenceArrayInput,
+ AutocompleteInput,
+ DeleteButton,
+} from 'react-admin';
+import { Box, Typography, Card, Stack } from '@mui/material';
+import { styled } from '@mui/material/styles';
+import SerialRuleItemCreate from "./SerialRuleItemCreate";
+import SerialRuleItemPanel from "./SerialRuleItemPanel";
+import EmptyData from "../components/EmptyData";
+import MyCreateButton from "../components/MyCreateButton";
+import MyExportButton from '../components/MyExportButton';
+import PageDrawer from "../components/PageDrawer";
+import MyField from "../components/MyField";
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
+import * as Common from '@/utils/common';
+
+const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
+ '& .css-1vooibu-MuiSvgIcon-root': {
+ height: '.9em'
+ },
+ '& .RaDatagrid-row': {
+ cursor: 'auto'
+ },
+ '& .column-name': {
+ },
+ '& .opt': {
+ width: 200
+ },
+}));
+
+const filters = [
+ <SearchInput source="condition" alwaysOn />,
+ <DateInput label='common.time.after' source="timeStart" alwaysOn />,
+ <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
+
+ <NumberInput source="ruleId" label="table.field.serialRuleItem.ruleId" />,
+ <TextInput source="wkType" label="table.field.serialRuleItem.wkType" />,
+ <TextInput source="feildValue" label="table.field.serialRuleItem.feildValue" />,
+ <NumberInput source="len" label="table.field.serialRuleItem.len" />,
+ <NumberInput source="lenStr" label="table.field.serialRuleItem.lenStr" />,
+ <NumberInput source="sort" label="table.field.serialRuleItem.sort" />,
+
+ <TextInput label="common.field.memo" source="memo" />,
+ <SelectInput
+ label="common.field.status"
+ source="status"
+ choices={[
+ { id: '1', name: 'common.enums.statusTrue' },
+ { id: '0', name: 'common.enums.statusFalse' },
+ ]}
+ resettable
+ />,
+]
+
+const SerialRuleItemList = () => {
+ const translate = useTranslate();
+
+ const [createDialog, setCreateDialog] = useState(false);
+ const [drawerVal, setDrawerVal] = useState(false);
+
+ return (
+ <Box display="flex">
+ <List
+ sx={{
+ flexGrow: 1,
+ transition: (theme) =>
+ theme.transitions.create(['all'], {
+ duration: theme.transitions.duration.enteringScreen,
+ }),
+ marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+ }}
+ title={"menu.serialRuleItem"}
+ empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ filters={filters}
+ sort={{ field: "create_time", order: "desc" }}
+ actions={(
+ <TopToolbar>
+ <FilterButton />
+ <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ <SelectColumnsButton preferenceKey='serialRuleItem' />
+ <MyExportButton />
+ </TopToolbar>
+ )}
+ perPage={DEFAULT_PAGE_SIZE}
+ >
+ <StyledDatagrid
+ preferenceKey='serialRuleItem'
+ bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ rowClick={(id, resource, record) => false}
+ expand={() => <SerialRuleItemPanel />}
+ expandSingle={true}
+ omit={['id', 'createTime', 'createBy', 'memo']}
+ >
+ <NumberField source="id" />
+ <NumberField source="ruleId" label="table.field.serialRuleItem.ruleId" />
+ <TextField source="wkType" label="table.field.serialRuleItem.wkType" />
+ <TextField source="feildValue" label="table.field.serialRuleItem.feildValue" />
+ <NumberField source="len" label="table.field.serialRuleItem.len" />
+ <NumberField source="lenStr" label="table.field.serialRuleItem.lenStr" />
+ <NumberField source="sort" label="table.field.serialRuleItem.sort" />
+
+ <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>
+ <DateField source="updateTime" label="common.field.updateTime" showTime />
+ <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>
+ <DateField source="createTime" label="common.field.createTime" showTime />
+ <BooleanField source="statusBool" label="common.field.status" sortable={false} />
+ <TextField source="memo" label="common.field.memo" sortable={false} />
+ <WrapperField cellClassName="opt" label="common.field.opt">
+ <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
+ <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ </WrapperField>
+ </StyledDatagrid>
+ </List>
+ <SerialRuleItemCreate
+ open={createDialog}
+ setOpen={setCreateDialog}
+ />
+ <PageDrawer
+ title='SerialRuleItem Detail'
+ drawerVal={drawerVal}
+ setDrawerVal={setDrawerVal}
+ >
+ </PageDrawer>
+ </Box>
+ )
+}
+
+export default SerialRuleItemList;
diff --git a/rsf-admin/src/page/serialRuleItem/SerialRuleItemPanel.jsx b/rsf-admin/src/page/serialRuleItem/SerialRuleItemPanel.jsx
new file mode 100644
index 0000000..6561de2
--- /dev/null
+++ b/rsf-admin/src/page/serialRuleItem/SerialRuleItemPanel.jsx
@@ -0,0 +1,87 @@
+import React, { useState, useRef, useEffect, useMemo } from "react";
+import { Box, Card, CardContent, Grid, Typography, Tooltip } from '@mui/material';
+import {
+ useTranslate,
+ useRecordContext,
+} from 'react-admin';
+import PanelTypography from "../components/PanelTypography";
+import * as Common from '@/utils/common'
+
+const SerialRuleItemPanel = () => {
+ const record = useRecordContext();
+ if (!record) return null;
+ const translate = useTranslate();
+ return (
+ <>
+ <Card sx={{ width: { xs: 300, sm: 500, md: 600, lg: 800 }, margin: 'auto' }}>
+ <CardContent>
+ <Grid container spacing={2}>
+ <Grid item xs={12} sx={{ display: 'flex', justifyContent: 'space-between' }}>
+ <Typography variant="h6" gutterBottom align="left" sx={{
+ maxWidth: { xs: '100px', sm: '180px', md: '260px', lg: '360px' },
+ whiteSpace: 'nowrap',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ }}>
+ {Common.camelToPascalWithSpaces(translate('table.field.serialRuleItem.id'))}: {record.id}
+ </Typography>
+ {/* inherit, primary, secondary, textPrimary, textSecondary, error */}
+ <Typography variant="h6" gutterBottom align="right" >
+ ID: {record.id}
+ </Typography>
+ </Grid>
+ </Grid>
+ <Grid container spacing={2}>
+ <Grid item xs={12} container alignContent="flex-end">
+ <Typography variant="caption" color="textSecondary" sx={{ wordWrap: 'break-word', wordBreak: 'break-all' }}>
+ {Common.camelToPascalWithSpaces(translate('common.field.memo'))}:{record.memo}
+ </Typography>
+ </Grid>
+ </Grid>
+ <Box height={20}> </Box>
+ <Grid container spacing={2}>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.serialRuleItem.ruleId"
+ property={record.ruleId}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.serialRuleItem.wkType"
+ property={record.wkType$}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.serialRuleItem.feildValue"
+ property={record.feildValue}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.serialRuleItem.len"
+ property={record.len}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.serialRuleItem.lenStr"
+ property={record.lenStr}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.serialRuleItem.sort"
+ property={record.sort}
+ />
+ </Grid>
+
+ </Grid>
+ </CardContent>
+ </Card >
+ </>
+ );
+};
+
+export default SerialRuleItemPanel;
diff --git a/rsf-admin/src/page/serialRuleItem/index.jsx b/rsf-admin/src/page/serialRuleItem/index.jsx
new file mode 100644
index 0000000..d7a3bde
--- /dev/null
+++ b/rsf-admin/src/page/serialRuleItem/index.jsx
@@ -0,0 +1,18 @@
+import React, { useState, useRef, useEffect, useMemo } from "react";
+import {
+ ListGuesser,
+ EditGuesser,
+ ShowGuesser,
+} from "react-admin";
+
+import SerialRuleItemList from "./SerialRuleItemList";
+import SerialRuleItemEdit from "./SerialRuleItemEdit";
+
+export default {
+ list: SerialRuleItemList,
+ edit: SerialRuleItemEdit,
+ show: ShowGuesser,
+ recordRepresentation: (record) => {
+ return `${record.id}`
+ }
+};
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
index 357b792..381ca3c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
@@ -22,9 +22,9 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="man_companys";
- generator.tableDesc="瀛楀吀鏁版嵁闆�";
- generator.packagePath="com.vincent.rsf.server.manager";
+ generator.table="sys_serial_rule_item";
+ generator.tableDesc="缂栫爜瑙勫垯瀛愯〃";
+ generator.packagePath="com.vincent.rsf.server.system";
generator.build();
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleController.java
new file mode 100644
index 0000000..c12d61e
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleController.java
@@ -0,0 +1,110 @@
+package com.vincent.rsf.server.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.annotation.OperationLog;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.KeyValVo;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.system.entity.SerialRule;
+import com.vincent.rsf.server.system.service.SerialRuleService;
+import com.vincent.rsf.server.system.controller.BaseController;
+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
+public class SerialRuleController extends BaseController {
+
+ @Autowired
+ private SerialRuleService serialRuleService;
+
+ @PreAuthorize("hasAuthority('system:serialRule:list')")
+ @PostMapping("/serialRule/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<SerialRule, BaseParam> pageParam = new PageParam<>(baseParam, SerialRule.class);
+ return R.ok().add(serialRuleService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('system:serialRule:list')")
+ @PostMapping("/serialRule/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(serialRuleService.list());
+ }
+
+ @PreAuthorize("hasAuthority('system:serialRule:list')")
+ @PostMapping({"/serialRule/many/{ids}", "/serialRules/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(serialRuleService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('system:serialRule:list')")
+ @GetMapping("/serialRule/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(serialRuleService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('system:serialRule:save')")
+ @OperationLog("Create 瀛楀吀鏁版嵁闆�")
+ @PostMapping("/serialRule/save")
+ public R save(@RequestBody SerialRule serialRule) {
+ serialRule.setCreateBy(getLoginUserId());
+ serialRule.setCreateTime(new Date());
+ serialRule.setUpdateBy(getLoginUserId());
+ serialRule.setUpdateTime(new Date());
+ if (!serialRuleService.save(serialRule)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(serialRule);
+ }
+
+ @PreAuthorize("hasAuthority('system:serialRule:update')")
+ @OperationLog("Update 瀛楀吀鏁版嵁闆�")
+ @PostMapping("/serialRule/update")
+ public R update(@RequestBody SerialRule serialRule) {
+ serialRule.setUpdateBy(getLoginUserId());
+ serialRule.setUpdateTime(new Date());
+ if (!serialRuleService.updateById(serialRule)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(serialRule);
+ }
+
+ @PreAuthorize("hasAuthority('system:serialRule:remove')")
+ @OperationLog("Delete 瀛楀吀鏁版嵁闆�")
+ @PostMapping("/serialRule/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!serialRuleService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('system:serialRule:list')")
+ @PostMapping("/serialRule/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<SerialRule> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(SerialRule::getCode, condition);
+ }
+ serialRuleService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('system:serialRule:list')")
+ @PostMapping("/serialRule/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(serialRuleService.list(), SerialRule.class), response);
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleItemController.java
new file mode 100644
index 0000000..411720e
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleItemController.java
@@ -0,0 +1,110 @@
+package com.vincent.rsf.server.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.annotation.OperationLog;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.KeyValVo;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.system.entity.SerialRuleItem;
+import com.vincent.rsf.server.system.service.SerialRuleItemService;
+import com.vincent.rsf.server.system.controller.BaseController;
+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
+public class SerialRuleItemController extends BaseController {
+
+ @Autowired
+ private SerialRuleItemService serialRuleItemService;
+
+ @PreAuthorize("hasAuthority('system:serialRuleItem:list')")
+ @PostMapping("/serialRuleItem/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<SerialRuleItem, BaseParam> pageParam = new PageParam<>(baseParam, SerialRuleItem.class);
+ return R.ok().add(serialRuleItemService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('system:serialRuleItem:list')")
+ @PostMapping("/serialRuleItem/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(serialRuleItemService.list());
+ }
+
+ @PreAuthorize("hasAuthority('system:serialRuleItem:list')")
+ @PostMapping({"/serialRuleItem/many/{ids}", "/serialRuleItems/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(serialRuleItemService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('system:serialRuleItem:list')")
+ @GetMapping("/serialRuleItem/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(serialRuleItemService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('system:serialRuleItem:save')")
+ @OperationLog("Create 缂栫爜瑙勫垯瀛愯〃")
+ @PostMapping("/serialRuleItem/save")
+ public R save(@RequestBody SerialRuleItem serialRuleItem) {
+ serialRuleItem.setCreateBy(getLoginUserId());
+ serialRuleItem.setCreateTime(new Date());
+ serialRuleItem.setUpdateBy(getLoginUserId());
+ serialRuleItem.setUpdateTime(new Date());
+ if (!serialRuleItemService.save(serialRuleItem)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(serialRuleItem);
+ }
+
+ @PreAuthorize("hasAuthority('system:serialRuleItem:update')")
+ @OperationLog("Update 缂栫爜瑙勫垯瀛愯〃")
+ @PostMapping("/serialRuleItem/update")
+ public R update(@RequestBody SerialRuleItem serialRuleItem) {
+ serialRuleItem.setUpdateBy(getLoginUserId());
+ serialRuleItem.setUpdateTime(new Date());
+ if (!serialRuleItemService.updateById(serialRuleItem)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(serialRuleItem);
+ }
+
+ @PreAuthorize("hasAuthority('system:serialRuleItem:remove')")
+ @OperationLog("Delete 缂栫爜瑙勫垯瀛愯〃")
+ @PostMapping("/serialRuleItem/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!serialRuleItemService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('system:serialRuleItem:list')")
+ @PostMapping("/serialRuleItem/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<SerialRuleItem> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(SerialRuleItem::getId, condition);
+ }
+ serialRuleItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('system:serialRuleItem:list')")
+ @PostMapping("/serialRuleItem/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(serialRuleItemService.list(), SerialRuleItem.class), response);
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
new file mode 100644
index 0000000..7f2920c
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
@@ -0,0 +1,240 @@
+package com.vincent.rsf.server.system.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+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.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.system.service.UserService;
+import com.vincent.rsf.server.system.entity.User;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("sys_serial_rule")
+public class SerialRule 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 code;
+
+ /**
+ * 鍚嶇О
+ */
+ @ApiModelProperty(value= "鍚嶇О")
+ private String name;
+
+ /**
+ * 鍒嗛殧绗�
+ */
+ @ApiModelProperty(value= "鍒嗛殧绗�")
+ private String delimit;
+
+ /**
+ * 搴忓彿閲嶇疆瑙勫垯 year: 骞� month: 鏈� day: 澶�
+ */
+ @ApiModelProperty(value= "搴忓彿閲嶇疆瑙勫垯 year: 骞� month: 鏈� day: 澶� ")
+ private String reset;
+
+ /**
+ * 閲嶇疆渚濊禆
+ */
+ @ApiModelProperty(value= "閲嶇疆渚濊禆")
+ private String resetDep;
+
+ /**
+ * 褰撳墠鍊�
+ */
+ @ApiModelProperty(value= "褰撳墠鍊�")
+ private String currValue;
+
+ /**
+ * 鏈�杩戠敓鎴愮紪鐮�
+ */
+ @ApiModelProperty(value= "鏈�杩戠敓鎴愮紪鐮�")
+ private String lastCode;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 绉熸埛
+ */
+ @ApiModelProperty(value= "绉熸埛")
+ private Integer tenantId;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public SerialRule() {}
+
+ public SerialRule(String code,String name,String delimit,String reset,String resetDep,String currValue,String lastCode,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.code = code;
+ this.name = name;
+ this.delimit = delimit;
+ this.reset = reset;
+ this.resetDep = resetDep;
+ this.currValue = currValue;
+ this.lastCode = lastCode;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// SerialRule serialRule = new SerialRule(
+// null, // 缂栧彿
+// null, // 鍚嶇О
+// null, // 鍒嗛殧绗�
+// null, // 搴忓彿閲嶇疆瑙勫垯[闈炵┖]
+// null, // 閲嶇疆渚濊禆
+// null, // 褰撳墠鍊�
+// null, // 鏈�杩戠敓鎴愮紪鐮�
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿[闈炵┖]
+// null // 澶囨敞
+// );
+
+ public String getReset$(){
+ if (null == this.reset){ return null; }
+ switch (this.reset){
+ case "year":
+ return " 骞�";
+ case "month":
+ return " 鏈�";
+ case "day":
+ return " 澶�";
+ default:
+ return String.valueOf(this.reset);
+ }
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "鍐荤粨";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+
+ public Boolean getStatusBool(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java
new file mode 100644
index 0000000..901ed35
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java
@@ -0,0 +1,234 @@
+package com.vincent.rsf.server.system.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+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.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.system.service.UserService;
+import com.vincent.rsf.server.system.entity.User;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("sys_serial_rule_item")
+public class SerialRuleItem implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 瑙勫垯涓昏〃鏍囪瘑
+ */
+ @ApiModelProperty(value= "瑙勫垯涓昏〃鏍囪瘑")
+ private Long ruleId;
+
+ /**
+ * 瑙勫垯绫诲瀷 1: 甯搁噺 2: 娴佹按鍙� 3: 鏃ユ湡 4: 涓氬姟瀛楁
+ */
+ @ApiModelProperty(value= "瑙勫垯绫诲瀷 1: 甯搁噺 2: 娴佹按鍙� 3: 鏃ユ湡 4: 涓氬姟瀛楁 ")
+ private String wkType;
+
+ /**
+ * 瀛楁鍊�
+ */
+ @ApiModelProperty(value= "瀛楁鍊�")
+ private String feildValue;
+
+ /**
+ * 鎴彇闀垮害
+ */
+ @ApiModelProperty(value= "鎴彇闀垮害")
+ private Integer len;
+
+ /**
+ * 璧峰浣嶇疆
+ */
+ @ApiModelProperty(value= "璧峰浣嶇疆")
+ private Integer lenStr;
+
+ /**
+ * 鎺掑簭椤哄簭
+ */
+ @ApiModelProperty(value= "鎺掑簭椤哄簭")
+ private Integer sort;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 绉熸埛
+ */
+ @ApiModelProperty(value= "绉熸埛")
+ private Integer tenantId;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public SerialRuleItem() {}
+
+ public SerialRuleItem(Long ruleId,String wkType,String feildValue,Integer len,Integer lenStr,Integer sort,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.ruleId = ruleId;
+ this.wkType = wkType;
+ this.feildValue = feildValue;
+ this.len = len;
+ this.lenStr = lenStr;
+ this.sort = sort;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// SerialRuleItem serialRuleItem = new SerialRuleItem(
+// null, // 瑙勫垯涓昏〃鏍囪瘑
+// null, // 瑙勫垯绫诲瀷
+// null, // 瀛楁鍊�
+// null, // 鎴彇闀垮害
+// null, // 璧峰浣嶇疆[闈炵┖]
+// null, // 鎺掑簭椤哄簭[闈炵┖]
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿[闈炵┖]
+// null // 澶囨敞
+// );
+
+ public String getWkType$(){
+ if (null == this.wkType){ return null; }
+ switch (this.wkType){
+ case "1":
+ return " 甯搁噺";
+ case "2":
+ return " 娴佹按鍙�";
+ case "3":
+ return " 鏃ユ湡";
+ case "4":
+ return " 涓氬姟瀛楁 ";
+ default:
+ return String.valueOf(this.wkType);
+ }
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "鍐荤粨";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+
+ public Boolean getStatusBool(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/SerialRuleItemMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/SerialRuleItemMapper.java
new file mode 100644
index 0000000..a117c2a
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/SerialRuleItemMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.system.mapper;
+
+import com.vincent.rsf.server.system.entity.SerialRuleItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface SerialRuleItemMapper extends BaseMapper<SerialRuleItem> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/SerialRuleMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/SerialRuleMapper.java
new file mode 100644
index 0000000..2cdc00d
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/SerialRuleMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.system.mapper;
+
+import com.vincent.rsf.server.system.entity.SerialRule;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface SerialRuleMapper extends BaseMapper<SerialRule> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/SerialRuleItemService.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/SerialRuleItemService.java
new file mode 100644
index 0000000..a4db525
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/SerialRuleItemService.java
@@ -0,0 +1,8 @@
+package com.vincent.rsf.server.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.server.system.entity.SerialRuleItem;
+
+public interface SerialRuleItemService extends IService<SerialRuleItem> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/SerialRuleService.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/SerialRuleService.java
new file mode 100644
index 0000000..bbba769
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/SerialRuleService.java
@@ -0,0 +1,8 @@
+package com.vincent.rsf.server.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.server.system.entity.SerialRule;
+
+public interface SerialRuleService extends IService<SerialRule> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/SerialRuleItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/SerialRuleItemServiceImpl.java
new file mode 100644
index 0000000..9a1e819
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/SerialRuleItemServiceImpl.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.system.service.impl;
+
+import com.vincent.rsf.server.system.mapper.SerialRuleItemMapper;
+import com.vincent.rsf.server.system.entity.SerialRuleItem;
+import com.vincent.rsf.server.system.service.SerialRuleItemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("serialRuleItemService")
+public class SerialRuleItemServiceImpl extends ServiceImpl<SerialRuleItemMapper, SerialRuleItem> implements SerialRuleItemService {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/SerialRuleServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/SerialRuleServiceImpl.java
new file mode 100644
index 0000000..e45cd8b
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/SerialRuleServiceImpl.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.system.service.impl;
+
+import com.vincent.rsf.server.system.mapper.SerialRuleMapper;
+import com.vincent.rsf.server.system.entity.SerialRule;
+import com.vincent.rsf.server.system.service.SerialRuleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("serialRuleService")
+public class SerialRuleServiceImpl extends ServiceImpl<SerialRuleMapper, SerialRule> implements SerialRuleService {
+
+}
diff --git a/rsf-server/src/main/java/serialRule.sql b/rsf-server/src/main/java/serialRule.sql
new file mode 100644
index 0000000..3b1fcbd
--- /dev/null
+++ b/rsf-server/src/main/java/serialRule.sql
@@ -0,0 +1,28 @@
+-- save serialRule record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.serialRule', '0', '/system/serialRule', 'serialRule', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 瀛楀吀鏁版嵁闆�', '123', '1', 'system:serialRule:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 瀛楀吀鏁版嵁闆�', '123', '1', 'system:serialRule:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 瀛楀吀鏁版嵁闆�', '123', '1', 'system:serialRule:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 瀛楀吀鏁版嵁闆�', '123', '1', 'system:serialRule:remove', '3', '1', '1');
+
+-- locale menu name
+serialRule: 'SerialRule',
+
+-- locale field
+serialRule: {
+ code: "code",
+ name: "name",
+ delimit: "delimit",
+ reset: "reset",
+ resetDep: "resetDep",
+ currValue: "currValue",
+ lastCode: "lastCode",
+},
+
+-- ResourceContent
+import serialRule from './serialRule';
+
+case 'serialRule':
+ return serialRule;
diff --git a/rsf-server/src/main/java/serialRuleItem.sql b/rsf-server/src/main/java/serialRuleItem.sql
new file mode 100644
index 0000000..2ff7fe3
--- /dev/null
+++ b/rsf-server/src/main/java/serialRuleItem.sql
@@ -0,0 +1,27 @@
+-- save serialRuleItem record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.serialRuleItem', '0', '/system/serialRuleItem', 'serialRuleItem', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 缂栫爜瑙勫垯瀛愯〃', '128', '1', 'system:serialRuleItem:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 缂栫爜瑙勫垯瀛愯〃', '128', '1', 'system:serialRuleItem:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 缂栫爜瑙勫垯瀛愯〃', '128', '1', 'system:serialRuleItem:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 缂栫爜瑙勫垯瀛愯〃', '128', '1', 'system:serialRuleItem:remove', '3', '1', '1');
+
+-- locale menu name
+serialRuleItem: 'SerialRuleItem',
+
+-- locale field
+serialRuleItem: {
+ ruleId: "ruleId",
+ wkType: "wkType",
+ feildValue: "feildValue",
+ len: "len",
+ lenStr: "lenStr",
+ sort: "sort",
+},
+
+-- ResourceContent
+import serialRuleItem from './serialRuleItem';
+
+case 'serialRuleItem':
+ return serialRuleItem;
diff --git a/rsf-server/src/main/resources/mapper/system/SerialRuleItemMapper.xml b/rsf-server/src/main/resources/mapper/system/SerialRuleItemMapper.xml
new file mode 100644
index 0000000..8736ee5
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/system/SerialRuleItemMapper.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.vincent.rsf.server.system.mapper.SerialRuleItemMapper">
+
+</mapper>
diff --git a/rsf-server/src/main/resources/mapper/system/SerialRuleMapper.xml b/rsf-server/src/main/resources/mapper/system/SerialRuleMapper.xml
new file mode 100644
index 0000000..c934d05
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/system/SerialRuleMapper.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.vincent.rsf.server.system.mapper.SerialRuleMapper">
+
+</mapper>
--
Gitblit v1.9.1