From e4e2ee76617b2b5fd0299edda7241428f60b3c4c Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 10 十二月 2025 08:39:09 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/MapAreaParam.java | 12
zy-acs-manager/src/main/resources/mapper/manager/AreaMapper.xml | 5
zy-acs-manager/src/main/java/area.sql | 33 +
zy-acs-flow/src/page/area/AreaCreate.jsx | 200 ++++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 30
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AreaController.java | 112 +++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AreaMapper.java | 12
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java | 12
zy-acs-flow/src/page/area/AreaEdit.jsx | 173 ++++++++
zy-acs-flow/src/page/area/AreaList.jsx | 178 ++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Area.java | 259 ++++++++++++
zy-acs-flow/src/page/area/AreaPanel.jsx | 123 ++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaService.java | 8
zy-acs-flow/src/page/area/index.jsx | 18
14 files changed, 1,159 insertions(+), 16 deletions(-)
diff --git a/zy-acs-flow/src/page/area/AreaCreate.jsx b/zy-acs-flow/src/page/area/AreaCreate.jsx
new file mode 100644
index 0000000..3c6efa5
--- /dev/null
+++ b/zy-acs-flow/src/page/area/AreaCreate.jsx
@@ -0,0 +1,200 @@
+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 AreaCreate = (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>
+ <Grid container rowSpacing={2} columnSpacing={2}>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.area.uuid"
+ source="uuid"
+ parse={v => v}
+ autoFocus
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.area.name"
+ source="name"
+ parse={v => v}
+ validate={required()}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.area.code"
+ source="code"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <ReferenceInput
+ source="zoneId"
+ reference="zone"
+ >
+ <AutocompleteInput
+ label="table.field.area.zoneId"
+ optionText="name"
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.area.type"
+ source="type"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.area.maxCount"
+ source="maxCount"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.area.speedLimit"
+ source="speedLimit"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.area.shapeType"
+ source="shapeType"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.area.shapeData"
+ source="shapeData"
+ parse={v => v}
+ validate={required()}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.area.color"
+ source="color"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.area.priority"
+ source="priority"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.area.version"
+ source="version"
+ 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 AreaCreate;
diff --git a/zy-acs-flow/src/page/area/AreaEdit.jsx b/zy-acs-flow/src/page/area/AreaEdit.jsx
new file mode 100644
index 0000000..0495998
--- /dev/null
+++ b/zy-acs-flow/src/page/area/AreaEdit.jsx
@@ -0,0 +1,173 @@
+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 AreaEdit = () => {
+ 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.area.uuid"
+ source="uuid"
+ parse={v => v}
+ autoFocus
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.area.name"
+ source="name"
+ parse={v => v}
+ validate={required()}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.area.code"
+ source="code"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <ReferenceInput
+ source="zoneId"
+ reference="zone"
+ perPage={REFERENCE_INPUT_PAGESIZE}
+ >
+ <AutocompleteInput
+ label="table.field.area.zoneId"
+ optionText="name"
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.area.type"
+ source="type"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.area.maxCount"
+ source="maxCount"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.area.speedLimit"
+ source="speedLimit"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.area.shapeType"
+ source="shapeType"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.area.shapeData"
+ source="shapeData"
+ parse={v => v}
+ validate={required()}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.area.color"
+ source="color"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.area.priority"
+ source="priority"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.area.version"
+ source="version"
+ 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 AreaEdit;
diff --git a/zy-acs-flow/src/page/area/AreaList.jsx b/zy-acs-flow/src/page/area/AreaList.jsx
new file mode 100644
index 0000000..55ca554
--- /dev/null
+++ b/zy-acs-flow/src/page/area/AreaList.jsx
@@ -0,0 +1,178 @@
+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 AreaCreate from "./AreaCreate";
+import AreaPanel from "./AreaPanel";
+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="uuid" label="table.field.area.uuid" />,
+ <TextInput source="name" label="table.field.area.name" />,
+ <TextInput source="code" label="table.field.area.code" />,
+ <ReferenceInput source="zoneId" label="table.field.area.zoneId" reference="zone">
+ <AutocompleteInput label="table.field.area.zoneId" optionText="name" filterToQuery={(val) => ({ name: val })} />
+ </ReferenceInput>,
+ <TextInput source="type" label="table.field.area.type" />,
+ <NumberInput source="maxCount" label="table.field.area.maxCount" />,
+ <TextInput source="speedLimit" label="table.field.area.speedLimit" />,
+ <TextInput source="shapeType" label="table.field.area.shapeType" />,
+ <TextInput source="shapeData" label="table.field.area.shapeData" />,
+ <TextInput source="color" label="table.field.area.color" />,
+ <NumberInput source="priority" label="table.field.area.priority" />,
+ <TextInput source="version" label="table.field.area.version" />,
+
+ <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 AreaList = () => {
+ 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.area"}
+ empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ filters={filters}
+ sort={{ field: "create_time", order: "desc" }}
+ actions={(
+ <TopToolbar>
+ <FilterButton />
+ <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ <SelectColumnsButton preferenceKey='area' />
+ <MyExportButton />
+ </TopToolbar>
+ )}
+ perPage={DEFAULT_PAGE_SIZE}
+ >
+ <StyledDatagrid
+ preferenceKey='area'
+ bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ rowClick={(id, resource, record) => false}
+ expand={() => <AreaPanel />}
+ expandSingle={true}
+ omit={['id', 'createTime', 'createBy', 'memo']}
+ >
+ <NumberField source="id" />
+ <TextField source="uuid" label="table.field.area.uuid" />
+ <TextField source="name" label="table.field.area.name" />
+ <TextField source="code" label="table.field.area.code" />
+ <ReferenceField source="zoneId" label="table.field.area.zoneId" reference="zone" link={false} sortable={false}>
+ <TextField source="name" />
+ </ReferenceField>
+ <TextField source="type" label="table.field.area.type" />
+ <NumberField source="maxCount" label="table.field.area.maxCount" />
+ <TextField source="speedLimit" label="table.field.area.speedLimit" />
+ <TextField source="shapeType" label="table.field.area.shapeType" />
+ <TextField source="shapeData" label="table.field.area.shapeData" />
+ <TextField source="color" label="table.field.area.color" />
+ <NumberField source="priority" label="table.field.area.priority" />
+ <TextField source="version" label="table.field.area.version" />
+
+ <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>
+ <AreaCreate
+ open={createDialog}
+ setOpen={setCreateDialog}
+ />
+ <PageDrawer
+ title='Area Detail'
+ drawerVal={drawerVal}
+ setDrawerVal={setDrawerVal}
+ >
+ </PageDrawer>
+ </Box>
+ )
+}
+
+export default AreaList;
diff --git a/zy-acs-flow/src/page/area/AreaPanel.jsx b/zy-acs-flow/src/page/area/AreaPanel.jsx
new file mode 100644
index 0000000..38b10ea
--- /dev/null
+++ b/zy-acs-flow/src/page/area/AreaPanel.jsx
@@ -0,0 +1,123 @@
+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 AreaPanel = () => {
+ 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.area.name'))}: {record.name}
+ </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.area.uuid"
+ property={record.uuid}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.area.name"
+ property={record.name}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.area.code"
+ property={record.code}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.area.zoneId"
+ property={record.zoneId$}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.area.type"
+ property={record.type}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.area.maxCount"
+ property={record.maxCount}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.area.speedLimit"
+ property={record.speedLimit}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.area.shapeType"
+ property={record.shapeType}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.area.shapeData"
+ property={record.shapeData}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.area.color"
+ property={record.color}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.area.priority"
+ property={record.priority}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.area.version"
+ property={record.version}
+ />
+ </Grid>
+
+ </Grid>
+ </CardContent>
+ </Card >
+ </>
+ );
+};
+
+export default AreaPanel;
diff --git a/zy-acs-flow/src/page/area/index.jsx b/zy-acs-flow/src/page/area/index.jsx
new file mode 100644
index 0000000..d5d1971
--- /dev/null
+++ b/zy-acs-flow/src/page/area/index.jsx
@@ -0,0 +1,18 @@
+import React, { useState, useRef, useEffect, useMemo } from "react";
+import {
+ ListGuesser,
+ EditGuesser,
+ ShowGuesser,
+} from "react-admin";
+
+import AreaList from "./AreaList";
+import AreaEdit from "./AreaEdit";
+
+export default {
+ list: AreaList,
+ edit: AreaEdit,
+ show: ShowGuesser,
+ recordRepresentation: (record) => {
+ return `${record.name}`
+ }
+};
diff --git a/zy-acs-manager/src/main/java/area.sql b/zy-acs-manager/src/main/java/area.sql
new file mode 100644
index 0000000..78cbe90
--- /dev/null
+++ b/zy-acs-manager/src/main/java/area.sql
@@ -0,0 +1,33 @@
+-- save area record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.area', '0', '/manager/area', 'area', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query Area', '', '1', 'manager:area:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create Area', '', '1', 'manager:area:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update Area', '', '1', 'manager:area:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete Area', '', '1', 'manager:area:remove', '3', '1', '1');
+
+-- locale menu name
+area: 'Area',
+
+-- locale field
+area: {
+ uuid: "uuid",
+ name: "name",
+ code: "code",
+ zoneId: "zoneId",
+ type: "type",
+ maxCount: "maxCount",
+ speedLimit: "speedLimit",
+ shapeType: "shapeType",
+ shapeData: "shapeData",
+ color: "color",
+ priority: "priority",
+ version: "version",
+},
+
+-- ResourceContent
+import area from './area';
+
+case 'area':
+ return area;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AreaController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AreaController.java
new file mode 100644
index 0000000..c8657d0
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AreaController.java
@@ -0,0 +1,112 @@
+package com.zy.acs.manager.manager.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.common.R;
+import com.zy.acs.manager.common.utils.ExcelUtil;
+import com.zy.acs.manager.common.annotation.OperationLog;
+import com.zy.acs.manager.common.domain.BaseParam;
+import com.zy.acs.manager.common.domain.KeyValVo;
+import com.zy.acs.manager.common.domain.PageParam;
+import com.zy.acs.manager.manager.entity.Area;
+import com.zy.acs.manager.manager.service.AreaService;
+import com.zy.acs.manager.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
+@RequestMapping("/api")
+public class AreaController extends BaseController {
+
+ @Autowired
+ private AreaService areaService;
+
+ @PreAuthorize("hasAuthority('manager:area:list')")
+ @PostMapping("/area/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Area, BaseParam> pageParam = new PageParam<>(baseParam, Area.class);
+ return R.ok().add(areaService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:area:list')")
+ @PostMapping("/area/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(areaService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:area:list')")
+ @PostMapping({"/area/many/{ids}", "/areas/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(areaService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:area:list')")
+ @GetMapping("/area/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(areaService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:area:save')")
+ @OperationLog("Create Area")
+ @PostMapping("/area/save")
+ public R save(@RequestBody Area area) {
+ Date now = new Date();
+ area.setCreateBy(getLoginUserId());
+ area.setCreateTime(now);
+ area.setUpdateBy(getLoginUserId());
+ area.setUpdateTime(now);
+ if (!areaService.save(area)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(area);
+ }
+
+ @PreAuthorize("hasAuthority('manager:area:update')")
+ @OperationLog("Update Area")
+ @PostMapping("/area/update")
+ public R update(@RequestBody Area area) {
+ area.setUpdateBy(getLoginUserId());
+ area.setUpdateTime(new Date());
+ if (!areaService.updateById(area)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(area);
+ }
+
+ @PreAuthorize("hasAuthority('manager:area:remove')")
+ @OperationLog("Delete Area")
+ @PostMapping("/area/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!areaService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:area:list')")
+ @PostMapping("/area/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<Area> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(Area::getName, condition);
+ }
+ areaService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('manager:area:list')")
+ @PostMapping("/area/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(areaService.list(), Area.class), response);
+ }
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
index 513ab9b..02792d4 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
@@ -18,6 +18,7 @@
import com.zy.acs.manager.core.service.MapService;
import com.zy.acs.manager.core.service.PatrolService;
import com.zy.acs.manager.core.service.floyd.FloydNavigateService;
+import com.zy.acs.manager.manager.controller.param.MapAreaParam;
import com.zy.acs.manager.manager.controller.param.MapDataParam;
import com.zy.acs.manager.manager.controller.param.MapParam;
import com.zy.acs.manager.manager.controller.result.MapAgvVo;
@@ -74,6 +75,8 @@
private PatrolService patrolService;
@Autowired
private AvoidWaveCalculator avoidWaveCalculator;
+ @Autowired
+ private AreaService areaService;
@PreAuthorize("hasAuthority('manager:loc:update')")
@PostMapping("/startupOrShutdown")
@@ -211,22 +214,6 @@
}
return R.ok().add(result);
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -439,4 +426,15 @@
return R.ok().add(mapDto);
}
+ // area operate -------------------------
+
+ @PreAuthorize("hasAuthority('map:save')")
+ @PostMapping("/area/save")
+ @Transactional
+ public R save(@RequestBody MapAreaParam param) {
+ Date now = new Date();
+
+ return R.ok();
+ }
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/MapAreaParam.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/MapAreaParam.java
new file mode 100644
index 0000000..a963ade
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/MapAreaParam.java
@@ -0,0 +1,12 @@
+package com.zy.acs.manager.manager.controller.param;
+
+import lombok.Data;
+
+@Data
+public class MapAreaParam {
+
+ private String zoneId;
+
+
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Area.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Area.java
new file mode 100644
index 0000000..ce32e04
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Area.java
@@ -0,0 +1,259 @@
+package com.zy.acs.manager.manager.entity;
+
+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 com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.common.SpringUtils;
+import com.zy.acs.manager.manager.service.ZoneService;
+import com.zy.acs.manager.system.entity.User;
+import com.zy.acs.manager.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@TableName("man_area")
+public class Area 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 uuid;
+
+ /**
+ * 鍚嶇О
+ */
+ @ApiModelProperty(value= "鍚嶇О")
+ private String name;
+
+ /**
+ * 缂栫爜
+ */
+ @ApiModelProperty(value= "缂栫爜")
+ private String code;
+
+ /**
+ * 搴撳尯
+ */
+ @ApiModelProperty(value= "搴撳尯")
+ private Long zoneId;
+
+ /**
+ * 鍖哄煙绫诲瀷
+ */
+ @ApiModelProperty(value= "鍖哄煙绫诲瀷")
+ private String type;
+
+ /**
+ * 鏈�澶ф暟閲�
+ */
+ @ApiModelProperty(value= "鏈�澶ф暟閲�")
+ private Integer maxCount;
+
+ /**
+ * 閫熷害闄愬埗
+ */
+ @ApiModelProperty(value= "閫熷害闄愬埗")
+ private String speedLimit;
+
+ /**
+ * 褰㈢姸绫诲瀷
+ */
+ @ApiModelProperty(value= "褰㈢姸绫诲瀷")
+ private String shapeType;
+
+ /**
+ * 褰㈢姸鏁版嵁
+ */
+ @ApiModelProperty(value= "褰㈢姸鏁版嵁")
+ private String shapeData;
+
+ /**
+ * 棰滆壊
+ */
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
+
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value= "浼樺厛绾�")
+ private Integer priority;
+
+ /**
+ * 鍖哄煙鐗堟湰
+ */
+ @ApiModelProperty(value= "鍖哄煙鐗堟湰")
+ private String version;
+
+ /**
+ * 鐘舵�� 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 Area() {}
+
+ public Area(String uuid,String name,String code,Long zoneId,String type,Integer maxCount,String speedLimit,String shapeType,String shapeData,String color,Integer priority,String version,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.uuid = uuid;
+ this.name = name;
+ this.code = code;
+ this.zoneId = zoneId;
+ this.type = type;
+ this.maxCount = maxCount;
+ this.speedLimit = speedLimit;
+ this.shapeType = shapeType;
+ this.shapeData = shapeData;
+ this.color = color;
+ this.priority = priority;
+ this.version = version;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// Area area = new Area(
+// null, // 缂栧彿
+// null, // 鍚嶇О[闈炵┖]
+// null, // 缂栫爜
+// null, // 搴撳尯
+// null, // 鍖哄煙绫诲瀷
+// null, // 鏈�澶ф暟閲�
+// null, // 閫熷害闄愬埗
+// null, // 褰㈢姸绫诲瀷
+// null, // 褰㈢姸鏁版嵁[闈炵┖]
+// null, // 棰滆壊
+// null, // 浼樺厛绾�
+// null, // 鍖哄煙鐗堟湰
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null // 澶囨敞
+// );
+
+ public String getZoneId$(){
+ ZoneService service = SpringUtils.getBean(ZoneService.class);
+ Zone zone = service.getById(this.zoneId);
+ if (!Cools.isEmpty(zone)){
+ return String.valueOf(zone.getName());
+ }
+ return null;
+ }
+
+ 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/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AreaMapper.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AreaMapper.java
new file mode 100644
index 0000000..5966d93
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AreaMapper.java
@@ -0,0 +1,12 @@
+package com.zy.acs.manager.manager.mapper;
+
+import com.zy.acs.manager.manager.entity.Area;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface AreaMapper extends BaseMapper<Area> {
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaService.java
new file mode 100644
index 0000000..8ab9984
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaService.java
@@ -0,0 +1,8 @@
+package com.zy.acs.manager.manager.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.acs.manager.manager.entity.Area;
+
+public interface AreaService extends IService<Area> {
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java
new file mode 100644
index 0000000..263cbf7
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.acs.manager.manager.service.impl;
+
+import com.zy.acs.manager.manager.mapper.AreaMapper;
+import com.zy.acs.manager.manager.entity.Area;
+import com.zy.acs.manager.manager.service.AreaService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("areaService")
+public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements AreaService {
+
+}
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/AreaMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/AreaMapper.xml
new file mode 100644
index 0000000..8173788
--- /dev/null
+++ b/zy-acs-manager/src/main/resources/mapper/manager/AreaMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.acs.manager.manager.mapper.AreaMapper">
+
+</mapper>
--
Gitblit v1.9.1