From 7fe6a2aa7d908d347c74dee9b005e483cb7dbd1e Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 18 九月 2024 09:16:43 +0800 Subject: [PATCH] # --- zy-acs-flow/src/page/bus/BusList.jsx | 164 +++++++++++++ zy-acs-flow/src/i18n/en.js | 10 zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java | 4 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java | 111 +++++++++ zy-acs-flow/src/page/ResourceContent.js | 4 zy-acs-flow/src/page/bus/BusEdit.jsx | 129 ++++++++++ zy-acs-flow/src/i18n/zh.js | 11 zy-acs-flow/src/page/bus/BusPanel.jsx | 87 +++++++ zy-acs-flow/src/page/bus/BusCreate.jsx | 156 +++++++++++++ zy-acs-flow/src/page/bus/index.jsx | 18 + 10 files changed, 691 insertions(+), 3 deletions(-) diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js index 3cf6e40..e37af7a 100644 --- a/zy-acs-flow/src/i18n/en.js +++ b/zy-acs-flow/src/i18n/en.js @@ -112,6 +112,7 @@ taskSts: 'Task Status', taskType: 'Task Type', vehFaultRec: 'Agv Fault', + bus: 'Bus', }, table: { @@ -393,6 +394,15 @@ resetTime: "reset time", state: "state", }, + bus: { + uuid: "uuid", + seqNum: "seq num", + startTime: "start time", + endTime: "end time", + busSts: "bus status", + phase: "phase", + }, + } } }; diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js index 41af553..cafed36 100644 --- a/zy-acs-flow/src/i18n/zh.js +++ b/zy-acs-flow/src/i18n/zh.js @@ -112,7 +112,7 @@ taskSts: '浠诲姟鐘舵��', taskType: '浠诲姟绫诲瀷', vehFaultRec: '杞﹁締鏁呴殰', - + bus: '浠诲姟鎬荤嚎', }, table: { field: { @@ -392,6 +392,15 @@ resetTime: "澶嶄綅鏃堕棿", state: "杩涘害", }, + bus: { + uuid: "缂栧彿", + seqNum: "鎬荤嚎缂栧彿", + startTime: "寮�濮嬫椂闂�", + endTime: "缁撴潫鏃堕棿", + busSts: "鎬荤嚎鐘舵��", + phase: "杩涘害", + }, + } } }; diff --git a/zy-acs-flow/src/page/ResourceContent.js b/zy-acs-flow/src/page/ResourceContent.js index afcd71b..9c02c5c 100644 --- a/zy-acs-flow/src/page/ResourceContent.js +++ b/zy-acs-flow/src/page/ResourceContent.js @@ -34,6 +34,8 @@ import taskSts from './taskSts'; import taskType from './taskType'; import vehFaultRec from './vehFaultRec'; +import bus from './bus'; + const ResourceContent = (node) => { switch (node.component) { @@ -97,6 +99,8 @@ return taskType; case 'vehFaultRec': return vehFaultRec; + case 'bus': + return bus; default: return { list: ListGuesser, diff --git a/zy-acs-flow/src/page/bus/BusCreate.jsx b/zy-acs-flow/src/page/bus/BusCreate.jsx new file mode 100644 index 0000000..a17c55c --- /dev/null +++ b/zy-acs-flow/src/page/bus/BusCreate.jsx @@ -0,0 +1,156 @@ +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 BusCreate = (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 (data) => { + notify('common.response.fail'); + }; + + 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.bus.uuid" + source="uuid" + parse={v => v} + autoFocus + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <TextInput + label="table.field.bus.seqNum" + source="seqNum" + parse={v => v} + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <DateInput + label="table.field.bus.startTime" + source="startTime" + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <DateInput + label="table.field.bus.endTime" + source="endTime" + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <ReferenceInput + source="busSts" + reference="busSts" + > + <AutocompleteInput + label="table.field.bus.busSts" + optionText="name" + filterToQuery={(val) => ({ name: val })} + /> + </ReferenceInput> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <TextInput + label="table.field.bus.phase" + source="phase" + 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 BusCreate; diff --git a/zy-acs-flow/src/page/bus/BusEdit.jsx b/zy-acs-flow/src/page/bus/BusEdit.jsx new file mode 100644 index 0000000..4977dbe --- /dev/null +++ b/zy-acs-flow/src/page/bus/BusEdit.jsx @@ -0,0 +1,129 @@ +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 BusEdit = () => { + 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.bus.uuid" + source="uuid" + parse={v => v} + autoFocus + /> + </Stack> + <Stack direction='row' gap={2}> + <TextInput + label="table.field.bus.seqNum" + source="seqNum" + parse={v => v} + /> + </Stack> + <Stack direction='row' gap={2}> + <DateInput + label="table.field.bus.startTime" + source="startTime" + /> + </Stack> + <Stack direction='row' gap={2}> + <DateInput + label="table.field.bus.endTime" + source="endTime" + /> + </Stack> + <Stack direction='row' gap={2}> + <ReferenceInput + source="busSts" + reference="busSts" + perPage={REFERENCE_INPUT_PAGESIZE} + > + <AutocompleteInput + label="table.field.bus.busSts" + optionText="name" + filterToQuery={(val) => ({ name: val })} + /> + </ReferenceInput> + </Stack> + <Stack direction='row' gap={2}> + <TextInput + label="table.field.bus.phase" + source="phase" + 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 BusEdit; diff --git a/zy-acs-flow/src/page/bus/BusList.jsx b/zy-acs-flow/src/page/bus/BusList.jsx new file mode 100644 index 0000000..968255d --- /dev/null +++ b/zy-acs-flow/src/page/bus/BusList.jsx @@ -0,0 +1,164 @@ +import React, { useState, useRef, useEffect, useMemo, useCallback } from "react"; +import { useNavigate } from 'react-router-dom'; +import { + List, + DatagridConfigurable, + SearchInput, + TopToolbar, + SelectColumnsButton, + EditButton, + FilterButton, + CreateButton, + ExportButton, + BulkDeleteButton, + WrapperField, + useRecordContext, + useTranslate, + useListContext, + useCreatePath, + 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 BusCreate from "./BusCreate"; +import BusPanel from "./BusPanel"; +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 } 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.bus.uuid" />, + <TextInput source="seqNum" label="table.field.bus.seqNum" />, + <DateInput source="startTime" label="table.field.bus.startTime" />, + <DateInput source="endTime" label="table.field.bus.endTime" />, + <ReferenceInput source="busSts" label="table.field.bus.busSts" reference="busSts"> + <AutocompleteInput label="table.field.bus.busSts" optionText="name" filterToQuery={(val) => ({ name: val })} /> + </ReferenceInput>, + <TextInput source="phase" label="table.field.bus.phase" />, + + <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' }, + ]} + />, +] + +const BusList = () => { + 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.bus"} + empty={<EmptyData onClick={() => { setCreateDialog(true) }} />} + filters={filters} + sort={{ field: "create_time", order: "desc" }} + actions={( + <TopToolbar> + <FilterButton /> + <MyCreateButton onClick={() => { setCreateDialog(true) }} /> + <SelectColumnsButton preferenceKey='bus' /> + <MyExportButton /> + </TopToolbar> + )} + perPage={25} + > + <StyledDatagrid + preferenceKey='bus' + bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />} + rowClick={(id, resource, record) => false} + expand={() => <BusPanel />} + expandSingle={true} + omit={['id', 'updateBy', 'createTime', 'createBy', 'memo']} + > + <NumberField source="id" /> + <TextField source="uuid" label="table.field.bus.uuid" /> + <TextField source="seqNum" label="table.field.bus.seqNum" /> + <DateField source="startTime" label="table.field.bus.startTime" showTime /> + <DateField source="endTime" label="table.field.bus.endTime" showTime /> + <ReferenceField source="busSts" label="table.field.bus.busSts" reference="busSts" link={false} sortable={false}> + <TextField source="name" /> + </ReferenceField> + <TextField source="phase" label="table.field.bus.phase" sortable={false} /> + + <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> + <BusCreate + open={createDialog} + setOpen={setCreateDialog} + /> + <PageDrawer + title='Bus Detail' + drawerVal={drawerVal} + setDrawerVal={setDrawerVal} + > + </PageDrawer> + </Box> + ) +} + +export default BusList; diff --git a/zy-acs-flow/src/page/bus/BusPanel.jsx b/zy-acs-flow/src/page/bus/BusPanel.jsx new file mode 100644 index 0000000..d24532f --- /dev/null +++ b/zy-acs-flow/src/page/bus/BusPanel.jsx @@ -0,0 +1,87 @@ +import React, { useState, useRef, useEffect, useMemo } from "react"; +import { Box, Card, CardContent, Grid, Typography, Tooltip } from '@mui/material'; +import { + useTranslate, + useRecordContext, +} from 'react-admin'; +import PanelTypography from "../components/PanelTypography"; +import * as Common from '@/utils/common' + +const BusPanel = () => { + 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.bus.seqNum'))}: {record.seqNum} + </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.bus.uuid" + property={record.uuid} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.bus.seqNum" + property={record.seqNum} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.bus.startTime" + property={record.startTime$} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.bus.endTime" + property={record.endTime$} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.bus.busSts" + property={record.busSts$} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.bus.phase" + property={record.phase} + /> + </Grid> + + </Grid> + </CardContent> + </Card > + </> + ); +}; + +export default BusPanel; diff --git a/zy-acs-flow/src/page/bus/index.jsx b/zy-acs-flow/src/page/bus/index.jsx new file mode 100644 index 0000000..246dcfb --- /dev/null +++ b/zy-acs-flow/src/page/bus/index.jsx @@ -0,0 +1,18 @@ +import React, { useState, useRef, useEffect, useMemo } from "react"; +import { + ListGuesser, + EditGuesser, + ShowGuesser, +} from "react-admin"; + +import BusList from "./BusList"; +import BusEdit from "./BusEdit"; + +export default { + list: BusList, + edit: BusEdit, + show: ShowGuesser, + recordRepresentation: (record) => { + return `${record.seqNum}` + } +}; diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java index 1701934..4a567ef 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java @@ -22,8 +22,8 @@ // generator.username="sa"; // generator.password="Zoneyung@zy56$"; - generator.table="man_veh_fault_rec"; - generator.tableDesc="VehFaultRec"; + generator.table="man_bus"; + generator.tableDesc="Bus"; generator.packagePath="com.zy.acs.manager.manager"; generator.build(); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java new file mode 100644 index 0000000..5d3f8b5 --- /dev/null +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java @@ -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.Bus; +import com.zy.acs.manager.manager.service.BusService; +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 BusController extends BaseController { + + @Autowired + private BusService busService; + + @PreAuthorize("hasAuthority('manager:bus:list')") + @PostMapping("/bus/page") + public R page(@RequestBody Map<String, Object> map) { + BaseParam baseParam = buildParam(map, BaseParam.class); + PageParam<Bus, BaseParam> pageParam = new PageParam<>(baseParam, Bus.class); + return R.ok().add(busService.page(pageParam, pageParam.buildWrapper(true))); + } + + @PreAuthorize("hasAuthority('manager:bus:list')") + @PostMapping("/bus/list") + public R list(@RequestBody Map<String, Object> map) { + return R.ok().add(busService.list()); + } + + @PreAuthorize("hasAuthority('manager:bus:list')") + @PostMapping({"/bus/many/{ids}", "/buss/many/{ids}"}) + public R many(@PathVariable Long[] ids) { + return R.ok().add(busService.listByIds(Arrays.asList(ids))); + } + + @PreAuthorize("hasAuthority('manager:bus:list')") + @GetMapping("/bus/{id}") + public R get(@PathVariable("id") Long id) { + return R.ok().add(busService.getById(id)); + } + + @PreAuthorize("hasAuthority('manager:bus:save')") + @OperationLog("Create Bus") + @PostMapping("/bus/save") + public R save(@RequestBody Bus bus) { + bus.setCreateBy(getLoginUserId()); + bus.setCreateTime(new Date()); + bus.setUpdateBy(getLoginUserId()); + bus.setUpdateTime(new Date()); + if (!busService.save(bus)) { + return R.error("Save Fail"); + } + return R.ok("Save Success").add(bus); + } + + @PreAuthorize("hasAuthority('manager:bus:update')") + @OperationLog("Update Bus") + @PostMapping("/bus/update") + public R update(@RequestBody Bus bus) { + bus.setUpdateBy(getLoginUserId()); + bus.setUpdateTime(new Date()); + if (!busService.updateById(bus)) { + return R.error("Update Fail"); + } + return R.ok("Update Success").add(bus); + } + + @PreAuthorize("hasAuthority('manager:bus:remove')") + @OperationLog("Delete Bus") + @PostMapping("/bus/remove/{ids}") + public R remove(@PathVariable Long[] ids) { + if (!busService.removeByIds(Arrays.asList(ids))) { + return R.error("Delete Fail"); + } + return R.ok("Delete Success").add(ids); + } + + @PreAuthorize("hasAuthority('manager:bus:list')") + @PostMapping("/bus/query") + public R query(@RequestParam(required = false) String condition) { + List<KeyValVo> vos = new ArrayList<>(); + LambdaQueryWrapper<Bus> wrapper = new LambdaQueryWrapper<>(); + if (!Cools.isEmpty(condition)) { + wrapper.like(Bus::getSeqNum, condition); + } + busService.page(new Page<>(1, 30), wrapper).getRecords().forEach( + item -> vos.add(new KeyValVo(item.getId(), item.getSeqNum())) + ); + return R.ok().add(vos); + } + + @PreAuthorize("hasAuthority('manager:bus:list')") + @PostMapping("/bus/export") + public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { + ExcelUtil.build(ExcelUtil.create(busService.list(), Bus.class), response); + } + +} -- Gitblit v1.9.1