zy-acs-flow/src/map/MapPage.jsx

@@ -352,7 +352,7 @@
                        <Button
                            variant={areaDrawing ? "outlined" : "contained"}
                            color="primary"
                            sx={{ mr: 2 }}
                            sx={{}}
                            disabled={areaDrawing}
                            onClick={() => {
                                const started = Tool.startAreaDrawing({

 zy-acs-flow/src/map/http.js

@@ -400,7 +400,7 @@
    try {
        const res = await request.post('/map/area/save', {
            zoneId: zoneId,
            area: areaData,
            ...areaData,
        });
        const { code, msg } = res.data;
        if (code !== 200) {

 zy-acs-flow/src/page/area/AreaCreate.jsx

New file
@@ -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;

 zy-acs-flow/src/page/area/AreaEdit.jsx

New file
@@ -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;

 zy-acs-flow/src/page/area/AreaList.jsx

New file
@@ -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;

 zy-acs-flow/src/page/area/AreaPanel.jsx

New file
@@ -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}>&nbsp;</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;

 zy-acs-flow/src/page/area/index.jsx

New file
@@ -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}`
    }
};

 zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java

@@ -259,7 +259,7 @@
        switch (this.sqlOsType) {
            case MYSQL:
                Class.forName("com.mysql.jdbc.Driver").newInstance();
                conn = DriverManager.getConnection("jdbc:mysql://"+url, username, password);
                conn = DriverManager.getConnection("jdbc:mysql://"+url+"?useSSL=false", username, password);
                this.columns = getMysqlColumns(conn, table, true, sqlOsType);
                break;
            case SQL_SERVER:

 zy-acs-manager/src/main/java/area.sql

New file
@@ -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;

 zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java

@@ -15,15 +15,15 @@
        generator.frontendPrefixPath = "zy-acs-flow/";

        generator.sqlOsType = SqlOsType.MYSQL;
        generator.url="localhost:3306/react_admin_dev";
        generator.url="localhost:3306/rcs_sca10";
        generator.username="root";
        generator.password="xltys1995";
//        generator.url="47.97.1.152:51433;databasename=jkasrs";
//        generator.username="sa";
//        generator.username="sa";priority
//        generator.password="Zoneyung@zy56$";

        generator.table="man_map";
        generator.tableDesc="Map";
        generator.table="man_area";
        generator.tableDesc="Area";
        generator.packagePath="com.zy.acs.manager.manager";

        generator.build();

 zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/AreaShapeDto.java

New file
@@ -0,0 +1,12 @@
package com.zy.acs.manager.common.domain;

import lombok.Data;

@Data
public class AreaShapeDto {

    private MapPointDto start;

    private MapPointDto end;

}

 zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/MapPointDto.java

New file
@@ -0,0 +1,12 @@
package com.zy.acs.manager.common.domain;

import lombok.Data;

@Data
public class MapPointDto {

    private Double x;

    private Double y;

}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AreaController.java

New file
@@ -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);
    }

}

 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,14 @@
        return R.ok().add(mapDto);
    }

    // area operate -------------------------

    @PreAuthorize("hasAuthority('manager:loc:update')")
    @PostMapping("/area/save")
    @Transactional
    public R save(@RequestBody MapAreaParam param) {
        areaService.saveMapArea(param, getLoginUserId());
        return R.ok();
    }

}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/MapAreaParam.java

New file
@@ -0,0 +1,31 @@
package com.zy.acs.manager.manager.controller.param;

import com.zy.acs.manager.common.domain.MapPointDto;
import lombok.Data;

@Data
public class MapAreaParam {

    private String zoneId;

    private String name;

    private MapPointDto start;

    private MapPointDto end;

    private String color;

    private String code;

    private String type;

    private Integer maxCount;

    private String speedLimit;

    private Integer priority;

    private String memo;

}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Area.java

New file
@@ -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;
        }
    }

}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AreaMapper.java

New file
@@ -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> {

}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaService.java

New file
@@ -0,0 +1,11 @@
package com.zy.acs.manager.manager.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.acs.manager.manager.controller.param.MapAreaParam;
import com.zy.acs.manager.manager.entity.Area;

public interface AreaService extends IService<Area> {

    void saveMapArea(MapAreaParam param, Long loginUserId);

}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java

New file
@@ -0,0 +1,58 @@
package com.zy.acs.manager.manager.service.impl;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.common.domain.AreaShapeDto;
import com.zy.acs.manager.manager.controller.param.MapAreaParam;
import com.zy.acs.manager.manager.entity.Area;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.mapper.AreaMapper;
import com.zy.acs.manager.manager.service.AreaService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;

@Slf4j
@Service("areaService")
public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements AreaService {


    @Override
    @Transactional(rollbackFor = Exception.class)
    public void saveMapArea(MapAreaParam param, Long loginUserId) {
        Date now = new Date();

        Area area = new Area();
        // major
        if (!Cools.isEmpty(param.getZoneId())) {
            area.setZoneId(Long.parseLong(param.getZoneId()));
        }
        area.setName(param.getName());
        area.setCode(param.getCode());
        area.setColor(param.getColor());
        area.setMaxCount(param.getMaxCount());
        area.setSpeedLimit(param.getSpeedLimit());
        area.setPriority(param.getPriority());

        // shape
        AreaShapeDto shapeDto = new AreaShapeDto();
        shapeDto.setStart(param.getStart());
        shapeDto.setEnd(param.getEnd());
        area.setShapeData(JSON.toJSONString(shapeDto));

        // common
        area.setStatus(StatusType.ENABLE.val);
        area.setCreateTime(now);
        area.setCreateBy(loginUserId);
        area.setUpdateTime(now);
        area.setUpdateBy(loginUserId);
        area.setMemo(param.getMemo());
        if (!this.save(area)) {
            log.error("failed to save area");
        }
    }

}

 zy-acs-manager/src/main/resources/mapper/manager/AreaMapper.xml

New file
@@ -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>