From ae0a456d98eaf5ea1174a001cfd03e23702f3164 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期六, 14 九月 2024 12:56:25 +0800 Subject: [PATCH] # --- zy-acs-flow/src/i18n/en.js | 6 zy-acs-flow/src/page/agvSts/AgvStsPanel.jsx | 63 ++++++ zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java | 4 zy-acs-flow/src/page/ResourceContent.js | 3 zy-acs-flow/src/page/agvSts/AgvStsCreate.jsx | 125 ++++++++++++ zy-acs-flow/src/page/agvSts/AgvStsEdit.jsx | 97 +++++++++ zy-acs-flow/src/page/agvSts/index.jsx | 18 + zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvStsController.java | 111 +++++++++++ zy-acs-flow/src/i18n/zh.js | 6 zy-acs-flow/src/page/agvSts/AgvStsList.jsx | 152 +++++++++++++++ 10 files changed, 583 insertions(+), 2 deletions(-) diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js index 25e20cb..e158743 100644 --- a/zy-acs-flow/src/i18n/en.js +++ b/zy-acs-flow/src/i18n/en.js @@ -102,6 +102,8 @@ locSts: 'Location Status', locType: 'Location Type', loc: 'Location', + agvSts: 'Agv Status', + }, table: { field: { @@ -286,6 +288,10 @@ zpallet: "zpallet", locType: "loc type", }, + agvSts: { + uuid: "uuid", + name: "name", + }, } } }; diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js index 2873adb..3e4a940 100644 --- a/zy-acs-flow/src/i18n/zh.js +++ b/zy-acs-flow/src/i18n/zh.js @@ -102,6 +102,8 @@ locSts: '搴撲綅鐘舵��', locType: '搴撲綅绫诲瀷', loc: '搴撲綅绠$悊', + agvSts: '杞﹁締鐘舵��', + }, table: { field: { @@ -285,6 +287,10 @@ zpallet: "鏂欑鐮�", locType: "搴撲綅绫诲瀷", }, + agvSts: { + uuid: "缂栧彿", + name: "鍚嶇О", + }, } } }; diff --git a/zy-acs-flow/src/page/ResourceContent.js b/zy-acs-flow/src/page/ResourceContent.js index 9ec88d9..796c3dc 100644 --- a/zy-acs-flow/src/page/ResourceContent.js +++ b/zy-acs-flow/src/page/ResourceContent.js @@ -24,6 +24,7 @@ import locSts from './locSts'; import locType from './locType'; import loc from './loc'; +import agvSts from './agvSts'; const ResourceContent = (node) => { @@ -68,6 +69,8 @@ return locType; case 'loc': return loc; + case 'agvSts': + return agvSts; default: return { list: ListGuesser, diff --git a/zy-acs-flow/src/page/agvSts/AgvStsCreate.jsx b/zy-acs-flow/src/page/agvSts/AgvStsCreate.jsx new file mode 100644 index 0000000..fd85fd8 --- /dev/null +++ b/zy-acs-flow/src/page/agvSts/AgvStsCreate.jsx @@ -0,0 +1,125 @@ +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 AgvStsCreate = (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.agvSts.uuid" + source="uuid" + parse={v => v} + autoFocus + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <TextInput + label="table.field.agvSts.name" + source="name" + 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 AgvStsCreate; diff --git a/zy-acs-flow/src/page/agvSts/AgvStsEdit.jsx b/zy-acs-flow/src/page/agvSts/AgvStsEdit.jsx new file mode 100644 index 0000000..084ca38 --- /dev/null +++ b/zy-acs-flow/src/page/agvSts/AgvStsEdit.jsx @@ -0,0 +1,97 @@ +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 AgvStsEdit = () => { + 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.agvSts.uuid" + source="uuid" + parse={v => v} + autoFocus + /> + </Stack> + <Stack direction='row' gap={2}> + <TextInput + label="table.field.agvSts.name" + source="name" + 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 AgvStsEdit; diff --git a/zy-acs-flow/src/page/agvSts/AgvStsList.jsx b/zy-acs-flow/src/page/agvSts/AgvStsList.jsx new file mode 100644 index 0000000..3999a1f --- /dev/null +++ b/zy-acs-flow/src/page/agvSts/AgvStsList.jsx @@ -0,0 +1,152 @@ +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 AgvStsCreate from "./AgvStsCreate"; +import AgvStsPanel from "./AgvStsPanel"; +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.agvSts.uuid" />, + <TextInput source="name" label="table.field.agvSts.name" />, + + <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 AgvStsList = () => { + 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.agvSts"} + empty={<EmptyData onClick={() => { setCreateDialog(true) }} />} + filters={filters} + sort={{ field: "create_time", order: "desc" }} + actions={( + <TopToolbar> + <FilterButton /> + <MyCreateButton onClick={() => { setCreateDialog(true) }} /> + <SelectColumnsButton preferenceKey='agvSts' /> + <MyExportButton /> + </TopToolbar> + )} + perPage={25} + > + <StyledDatagrid + preferenceKey='agvSts' + bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />} + rowClick={(id, resource, record) => false} + expand={() => <AgvStsPanel />} + expandSingle={true} + omit={['id', 'createTime', 'createBy', 'memo']} + > + <NumberField source="id" /> + <TextField source="uuid" label="table.field.agvSts.uuid" /> + <TextField source="name" label="table.field.agvSts.name" /> + + <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> + <AgvStsCreate + open={createDialog} + setOpen={setCreateDialog} + /> + <PageDrawer + title='AgvSts Detail' + drawerVal={drawerVal} + setDrawerVal={setDrawerVal} + > + </PageDrawer> + </Box> + ) +} + +export default AgvStsList; diff --git a/zy-acs-flow/src/page/agvSts/AgvStsPanel.jsx b/zy-acs-flow/src/page/agvSts/AgvStsPanel.jsx new file mode 100644 index 0000000..b777c9c --- /dev/null +++ b/zy-acs-flow/src/page/agvSts/AgvStsPanel.jsx @@ -0,0 +1,63 @@ +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 AgvStsPanel = () => { + 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.agvSts.name'))}: {record.name} + </Typography> + {/* inherit, primary, secondary, textPrimary, textSecondary, error */} + <Typography variant="h6" gutterBottom align="right" > + ID: {record.id} + </Typography> + </Grid> + </Grid> + <Grid container spacing={2}> + <Grid item xs={12} container alignContent="flex-end"> + <Typography variant="caption" color="textSecondary" sx={{ wordWrap: 'break-word', wordBreak: 'break-all' }}> + {Common.camelToPascalWithSpaces(translate('common.field.memo'))}:{record.memo} + </Typography> + </Grid> + </Grid> + <Box height={20}> </Box> + <Grid container spacing={2}> + <Grid item xs={6}> + <PanelTypography + title="table.field.agvSts.uuid" + property={record.uuid} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.agvSts.name" + property={record.name} + /> + </Grid> + + </Grid> + </CardContent> + </Card > + </> + ); +}; + +export default AgvStsPanel; diff --git a/zy-acs-flow/src/page/agvSts/index.jsx b/zy-acs-flow/src/page/agvSts/index.jsx new file mode 100644 index 0000000..2cc4632 --- /dev/null +++ b/zy-acs-flow/src/page/agvSts/index.jsx @@ -0,0 +1,18 @@ +import React, { useState, useRef, useEffect, useMemo } from "react"; +import { + ListGuesser, + EditGuesser, + ShowGuesser, +} from "react-admin"; + +import AgvStsList from "./AgvStsList"; +import AgvStsEdit from "./AgvStsEdit"; + +export default { + list: AgvStsList, + edit: AgvStsEdit, + show: ShowGuesser, + recordRepresentation: (record) => { + return `${record.name}` + } +}; 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 43bf58b..d37fd68 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_loc"; - generator.tableDesc="Loc"; + generator.table="man_agv_sts"; + generator.tableDesc="AgvSts"; generator.packagePath="com.zy.acs.manager.manager"; generator.build(); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvStsController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvStsController.java new file mode 100644 index 0000000..ab958fd --- /dev/null +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvStsController.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.AgvSts; +import com.zy.acs.manager.manager.service.AgvStsService; +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 AgvStsController extends BaseController { + + @Autowired + private AgvStsService agvStsService; + + @PreAuthorize("hasAuthority('manager:agvSts:list')") + @PostMapping("/agvSts/page") + public R page(@RequestBody Map<String, Object> map) { + BaseParam baseParam = buildParam(map, BaseParam.class); + PageParam<AgvSts, BaseParam> pageParam = new PageParam<>(baseParam, AgvSts.class); + return R.ok().add(agvStsService.page(pageParam, pageParam.buildWrapper(true))); + } + + @PreAuthorize("hasAuthority('manager:agvSts:list')") + @PostMapping("/agvSts/list") + public R list(@RequestBody Map<String, Object> map) { + return R.ok().add(agvStsService.list()); + } + + @PreAuthorize("hasAuthority('manager:agvSts:list')") + @PostMapping({"/agvSts/many/{ids}", "/agvStss/many/{ids}"}) + public R many(@PathVariable Long[] ids) { + return R.ok().add(agvStsService.listByIds(Arrays.asList(ids))); + } + + @PreAuthorize("hasAuthority('manager:agvSts:list')") + @GetMapping("/agvSts/{id}") + public R get(@PathVariable("id") Long id) { + return R.ok().add(agvStsService.getById(id)); + } + + @PreAuthorize("hasAuthority('manager:agvSts:save')") + @OperationLog("Create AgvSts") + @PostMapping("/agvSts/save") + public R save(@RequestBody AgvSts agvSts) { + agvSts.setCreateBy(getLoginUserId()); + agvSts.setCreateTime(new Date()); + agvSts.setUpdateBy(getLoginUserId()); + agvSts.setUpdateTime(new Date()); + if (!agvStsService.save(agvSts)) { + return R.error("Save Fail"); + } + return R.ok("Save Success").add(agvSts); + } + + @PreAuthorize("hasAuthority('manager:agvSts:update')") + @OperationLog("Update AgvSts") + @PostMapping("/agvSts/update") + public R update(@RequestBody AgvSts agvSts) { + agvSts.setUpdateBy(getLoginUserId()); + agvSts.setUpdateTime(new Date()); + if (!agvStsService.updateById(agvSts)) { + return R.error("Update Fail"); + } + return R.ok("Update Success").add(agvSts); + } + + @PreAuthorize("hasAuthority('manager:agvSts:remove')") + @OperationLog("Delete AgvSts") + @PostMapping("/agvSts/remove/{ids}") + public R remove(@PathVariable Long[] ids) { + if (!agvStsService.removeByIds(Arrays.asList(ids))) { + return R.error("Delete Fail"); + } + return R.ok("Delete Success").add(ids); + } + + @PreAuthorize("hasAuthority('manager:agvSts:list')") + @PostMapping("/agvSts/query") + public R query(@RequestParam(required = false) String condition) { + List<KeyValVo> vos = new ArrayList<>(); + LambdaQueryWrapper<AgvSts> wrapper = new LambdaQueryWrapper<>(); + if (!Cools.isEmpty(condition)) { + wrapper.like(AgvSts::getName, condition); + } + agvStsService.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:agvSts:list')") + @PostMapping("/agvSts/export") + public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { + ExcelUtil.build(ExcelUtil.create(agvStsService.list(), AgvSts.class), response); + } + +} -- Gitblit v1.9.1