#

vincentlu

3 天以前 b033217d3193b2f5ebabb43cce4c7cb2776df6ee

#

 zy-acs-flow/src/i18n/en.js

@@ -154,6 +154,7 @@
        action: 'Action',
        mission: 'Mission',
        staReserve: 'Sta Reserve',
        lane: 'Lane',
    },
    table: {
        field: {
@@ -583,6 +584,15 @@
                cancelledAt: "cancelled at",
                uniqKey: "unique key",
            },
            lane: {
                uuid: "uuid",
                zoneId: "zone",
                name: "name",
                hashCode: "hash",
                codes: "codes",
                entryAngle: "entry angle",
                maximum: "maximum",
            },
        }
    },
    page: {

 zy-acs-flow/src/i18n/zh.js

@@ -154,6 +154,7 @@
        action: '动作',
        mission: '执行',
        staReserve: '站点预约',
        lane: '巷道',
    },
    table: {
        field: {
@@ -583,6 +584,15 @@
                cancelledAt: "取消时间",
                uniqKey: "幂等键",
            },
            lane: {
                uuid: "编号",
                zoneId: "库区",
                name: "名称",
                hashCode: "哈希值",
                codes: "条码集",
                entryAngle: "入口角度",
                maximum: "承载量",
            },
        }
    },
    page: {

 zy-acs-flow/src/page/ResourceContent.js

@@ -42,6 +42,7 @@
import action from './action';
import mission from "./mission";
import staReserve from './staReserve';
import lane from './lane';

const ResourceContent = (node) => {
    switch (node.component) {
@@ -121,6 +122,8 @@
            return mission;
        case 'staReserve':
            return staReserve;
        case 'lane':
            return lane;
        default:
            return {
                list: ListGuesser,

 zy-acs-flow/src/page/lane/LaneCreate.jsx

New file
@@ -0,0 +1,165 @@
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 LaneCreate = (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.lane.uuid"
                                        source="uuid"
                                        parse={v => v}
                                        autoFocus
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput
                                        source="zoneId"
                                        reference="zone"
                                    >
                                        <AutocompleteInput
                                            label="table.field.lane.zoneId"
                                            optionText="name"
                                            filterToQuery={(val) => ({ name: val })}
                                        />
                                    </ReferenceInput>
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.lane.name"
                                        source="name"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.lane.hashCode"
                                        source="hashCode"
                                        parse={v => v}
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.lane.codes"
                                        source="codes"
                                        parse={v => v}
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.lane.entryAngle"
                                        source="entryAngle"
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.lane.maximum"
                                        source="maximum"
                                    />
                                </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 LaneCreate;

 zy-acs-flow/src/page/lane/LaneEdit.jsx

New file
@@ -0,0 +1,138 @@
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 LaneEdit = () => {
    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.lane.uuid"
                                source="uuid"
                                parse={v => v}
                                autoFocus
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <ReferenceInput
                                source="zoneId"
                                reference="zone"
                                perPage={REFERENCE_INPUT_PAGESIZE}
                            >
                                <AutocompleteInput
                                    label="table.field.lane.zoneId"
                                    optionText="name"
                                    filterToQuery={(val) => ({ name: val })}
                                />
                            </ReferenceInput>
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.lane.name"
                                source="name"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.lane.hashCode"
                                source="hashCode"
                                parse={v => v}
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.lane.codes"
                                source="codes"
                                parse={v => v}
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.lane.entryAngle"
                                source="entryAngle"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.lane.maximum"
                                source="maximum"
                            />
                        </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 LaneEdit;

 zy-acs-flow/src/page/lane/LaneList.jsx

New file
@@ -0,0 +1,168 @@
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 LaneCreate from "./LaneCreate";
import LanePanel from "./LanePanel";
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.lane.uuid" />,
    <ReferenceInput source="zoneId" label="table.field.lane.zoneId" reference="zone">
        <AutocompleteInput label="table.field.lane.zoneId" optionText="name" filterToQuery={(val) => ({ name: val })} />
    </ReferenceInput>,
    <TextInput source="name" label="table.field.lane.name" />,
    <TextInput source="hashCode" label="table.field.lane.hashCode" />,
    <TextInput source="codes" label="table.field.lane.codes" />,
    <NumberInput source="entryAngle" label="table.field.lane.entryAngle" />,
    <NumberInput source="maximum" label="table.field.lane.maximum" />,

    <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 LaneList = () => {
    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.lane"}
                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
                filters={filters}
                sort={{ field: "create_time", order: "desc" }}
                actions={(
                    <TopToolbar>
                        <FilterButton />
                        <MyCreateButton onClick={() => { setCreateDialog(true) }} />
                        <SelectColumnsButton preferenceKey='lane' />
                        <MyExportButton />
                    </TopToolbar>
                )}
                perPage={DEFAULT_PAGE_SIZE}
            >
                <StyledDatagrid
                    preferenceKey='lane'
                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    rowClick={(id, resource, record) => false}
                    expand={() => <LanePanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="uuid" label="table.field.lane.uuid" />
                    <ReferenceField source="zoneId" label="table.field.lane.zoneId" reference="zone" link={false} sortable={false}>
                        <TextField source="name" />
                    </ReferenceField>
                    <TextField source="name" label="table.field.lane.name" />
                    <TextField source="hashCode" label="table.field.lane.hashCode" />
                    <TextField source="codes" label="table.field.lane.codes" />
                    <NumberField source="entryAngle" label="table.field.lane.entryAngle" />
                    <NumberField source="maximum" label="table.field.lane.maximum" />

                    <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>
            <LaneCreate
                open={createDialog}
                setOpen={setCreateDialog}
            />
            <PageDrawer
                title='Lane Detail'
                drawerVal={drawerVal}
                setDrawerVal={setDrawerVal}
            >
            </PageDrawer>
        </Box>
    )
}

export default LaneList;

 zy-acs-flow/src/page/lane/LanePanel.jsx

New file
@@ -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 LanePanel = () => {
    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.lane.uuid'))}: {record.uuid}
                            </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.lane.uuid" 
                                property={record.uuid}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.lane.zoneId" 
                                property={record.zoneId$}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.lane.name" 
                                property={record.name}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.lane.hashCode" 
                                property={record.hashCode}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.lane.codes" 
                                property={record.codes}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.lane.entryAngle" 
                                property={record.entryAngle}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.lane.maximum" 
                                property={record.maximum}
                            />
                        </Grid>

                    </Grid>
                </CardContent>
            </Card >
        </>
    );
};

export default LanePanel;

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

New file
@@ -0,0 +1,18 @@
import React, { useState, useRef, useEffect, useMemo } from "react";
import {
    ListGuesser,
    EditGuesser,
    ShowGuesser,
} from "react-admin";

import LaneList from "./LaneList";
import LaneEdit from "./LaneEdit";

export default {
    list: LaneList,
    edit: LaneEdit,
    show: ShowGuesser,
    recordRepresentation: (record) => {
        return `${record.uuid}`
    }
};

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

@@ -22,8 +22,8 @@
//        generator.username="sa";priority
//        generator.password="Zoneyung@zy56$";

        generator.table="man_sta_reserve";
        generator.tableDesc="StaReserve";
        generator.table="man_lane";
        generator.tableDesc="Lane";
        generator.packagePath="com.zy.acs.manager.manager";

        generator.build();

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java

@@ -45,7 +45,7 @@
    @Autowired
    private LocService locService;
    @Autowired
    private LaneService laneService;
    private LaneBuilder laneBuilder;
    @Autowired
    private AgvAreaDispatcher agvAreaDispatcher;
    @Autowired
@@ -412,7 +412,7 @@
    }

    public Boolean validCapacityOfLane(String agvNo, Code code) {
        Lane lane = laneService.search(code.getData());
        Lane lane = laneBuilder.search(code.getData());
        if (null != lane) {
            Integer maxAgvCountInLane = configService.getVal("maxAgvCountInLane", Integer.class);


 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneBuilder.java

File was renamed from zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java
@@ -20,7 +20,6 @@
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.*;
@@ -31,7 +30,7 @@
 */
@Slf4j
@Service
public class LaneService {
public class LaneBuilder {

    private final RedisSupport redis = RedisSupport.defaultRedisSupport;


 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java

@@ -94,7 +94,7 @@
    @Autowired
    private AgvModelService agvModelService;
    @Autowired
    private LaneService laneService;
    private LaneBuilder laneBuilder;
    @Autowired
    private ActionSorter actionSorter;
    @Autowired
@@ -792,7 +792,7 @@
            task.setOriCode(agvDetail.getCode());
            task.setDestCode(endCode.getId());
            // lane
            Lane destLane = laneService.search(endCode.getData());
            Lane destLane = laneBuilder.search(endCode.getData());
            if (null != destLane) {
                task.setDestLaneHash(destLane.getHashCode());
            }

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/RetreatNavigateService.java

@@ -45,7 +45,7 @@
    @Autowired
    private AgvModelService agvModelService;
    @Autowired
    private LaneService laneService;
    private LaneBuilder laneBuilder;
    @Autowired
    private ConfigService configService;
    @Autowired
@@ -137,7 +137,7 @@

                // lane
                if (pointOfTurn) {
                    List<int[]> laneCodeIdxList = laneService.getLaneCodeIdxList(node.getCodeData());
                    List<int[]> laneCodeIdxList = laneBuilder.getLaneCodeIdxList(node.getCodeData());
                    if (!Cools.isEmpty(laneCodeIdxList)) {
                        Set<String> lanVehicleSet = new HashSet<>();

@@ -235,7 +235,7 @@

                        for (RetreatNavigateNode node : neighborNodes) {
                            // lane
                            List<int[]> laneCodeIdxList = laneService.getLaneCodeIdxList(node.getCodeData());
                            List<int[]> laneCodeIdxList = laneBuilder.getLaneCodeIdxList(node.getCodeData());
                            if (!Cools.isEmpty(laneCodeIdxList)) {
                                Set<String> lanVehicleSet = new HashSet<>();


 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/AStarNavigateService.java

@@ -4,7 +4,7 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.common.utils.MapDataUtils;
import com.zy.acs.manager.core.service.AgvAreaDispatcher;
import com.zy.acs.manager.core.service.LaneService;
import com.zy.acs.manager.core.service.LaneBuilder;
import com.zy.acs.manager.core.service.astart.domain.AStarNavigateNode;
import com.zy.acs.manager.core.service.astart.domain.DynamicNode;
import com.zy.acs.manager.core.utils.RouteGenerator;
@@ -39,7 +39,7 @@
    @Autowired
    private JamService jamService;
    @Autowired
    private LaneService laneService;
    private LaneBuilder laneBuilder;
    @Autowired
    private ConfigService configService;
    @Autowired
@@ -156,7 +156,7 @@
                }

                // 单巷道车辆容载数量
                List<int[]> laneCodeIdxList = laneService.getLaneCodeIdxList(node.getCodeData());
                List<int[]> laneCodeIdxList = laneBuilder.getLaneCodeIdxList(node.getCodeData());
                if (!Cools.isEmpty(laneCodeIdxList)) {
                    Set<String> lanVehicleSet = new HashSet<>();


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

New file
@@ -0,0 +1,111 @@
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.Lane;
import com.zy.acs.manager.manager.service.LaneService;
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 LaneController extends BaseController {

    @Autowired
    private LaneService laneService;

    @PreAuthorize("hasAuthority('manager:lane:list')")
    @PostMapping("/lane/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Lane, BaseParam> pageParam = new PageParam<>(baseParam, Lane.class);
        return R.ok().add(laneService.page(pageParam, pageParam.buildWrapper(true)));
    }

    @PreAuthorize("hasAuthority('manager:lane:list')")
    @PostMapping("/lane/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(laneService.list());
    }

    @PreAuthorize("hasAuthority('manager:lane:list')")
    @PostMapping({"/lane/many/{ids}", "/lanes/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(laneService.listByIds(Arrays.asList(ids)));
    }

    @PreAuthorize("hasAuthority('manager:lane:list')")
    @GetMapping("/lane/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(laneService.getById(id));
    }

    @PreAuthorize("hasAuthority('manager:lane:save')")
    @OperationLog("Create Lane")
    @PostMapping("/lane/save")
    public R save(@RequestBody Lane lane) {
        lane.setCreateBy(getLoginUserId());
        lane.setCreateTime(new Date());
        lane.setUpdateBy(getLoginUserId());
        lane.setUpdateTime(new Date());
        if (!laneService.save(lane)) {
            return R.error("Save Fail");
        }
        return R.ok("Save Success").add(lane);
    }

    @PreAuthorize("hasAuthority('manager:lane:update')")
    @OperationLog("Update Lane")
    @PostMapping("/lane/update")
    public R update(@RequestBody Lane lane) {
        lane.setUpdateBy(getLoginUserId());
        lane.setUpdateTime(new Date());
        if (!laneService.updateById(lane)) {
            return R.error("Update Fail");
        }
        return R.ok("Update Success").add(lane);
    }

    @PreAuthorize("hasAuthority('manager:lane:remove')")
    @OperationLog("Delete Lane")
    @PostMapping("/lane/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!laneService.removeByIds(Arrays.asList(ids))) {
            return R.error("Delete Fail");
        }
        return R.ok("Delete Success").add(ids);
    }

    @PreAuthorize("hasAuthority('manager:lane:list')")
    @PostMapping("/lane/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<Lane> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(Lane::getUuid, condition);
        }
        laneService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getUuid()))
        );
        return R.ok().add(vos);
    }

    @PreAuthorize("hasAuthority('manager:lane:list')")
    @PostMapping("/lane/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(laneService.list(), Lane.class), response);
    }

}

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

New file
@@ -0,0 +1,132 @@
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("man_lane")
public class Lane 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 Long zoneId;

    /**
     * 名称
     */
    @ApiModelProperty(value= "名称")
    private String name;

    /**
     * 哈希值
     */
    @ApiModelProperty(value= "哈希值")
    private String hashCode;

    /**
     * 条码集
     */
    @ApiModelProperty(value= "条码集")
    private String codes;

    /**
     * 入口角度
     */
    @ApiModelProperty(value= "入口角度")
    private Integer entryAngle;

    /**
     * 承载量
     */
    @ApiModelProperty(value= "承载量")
    private Integer maximum;

    /**
     * 状态 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 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/LaneMapper.java

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

import com.zy.acs.manager.manager.entity.Lane;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface LaneMapper extends BaseMapper<Lane> {

}

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

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

public interface LaneService extends IService<Lane> {

}

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

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

import com.zy.acs.manager.manager.mapper.LaneMapper;
import com.zy.acs.manager.manager.entity.Lane;
import com.zy.acs.manager.manager.service.LaneService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("laneService")
public class LaneServiceImpl extends ServiceImpl<LaneMapper, Lane> implements LaneService {

}

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

@@ -12,7 +12,7 @@
import com.zy.acs.manager.common.domain.PageResult;
import com.zy.acs.manager.common.exception.BusinessException;
import com.zy.acs.manager.core.domain.Lane;
import com.zy.acs.manager.core.service.LaneService;
import com.zy.acs.manager.core.service.LaneBuilder;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.mapper.TaskMapper;
@@ -41,7 +41,7 @@
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private LaneService laneService;
    private LaneBuilder laneBuilder;
    @Autowired
    private StaReserveService staReserveService;
    @Autowired
@@ -199,7 +199,7 @@
        if (null == codeId) {
            return null;
        }
        return laneService.search(codeService.getCacheById(codeId).getData());
        return laneBuilder.search(codeService.getCacheById(codeId).getData());
    }

    @Override
@@ -222,7 +222,7 @@
        if (null == codeId) {
            return null;
        }
        return laneService.search(codeService.getCacheById(codeId).getData());
        return laneBuilder.search(codeService.getCacheById(codeId).getData());
    }

    @Override

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

New file
@@ -0,0 +1,8 @@
-- mysql
insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.lane', '0', '/manager/lane', 'lane', '0' , '0', '1' , '1');
-- BorderHorizontal
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query Lane', '', '1', 'manager:lane:list', '0', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create Lane', '', '1', 'manager:lane:save', '1', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update Lane', '', '1', 'manager:lane:update', '2', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete Lane', '', '1', 'manager:lane:remove', '3', '1', '1');


 zy-acs-manager/src/main/resources/mapper/manager/LaneMapper.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.LaneMapper">

</mapper>