From 4a4b50564cdc3f6908154efc7751c95492403168 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 20 九月 2024 15:12:51 +0800 Subject: [PATCH] # --- zy-acs-flow/src/page/agv/AgvList.jsx | 3 + zy-acs-flow/src/page/agv/AgvCard.jsx | 2 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java | 6 ++ zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml | 37 ++---------------- zy-acs-flow/src/page/agv/AgvListFilter.jsx | 28 ++++++++++++++ zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java | 2 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/zy-acs-flow/src/page/agv/AgvCard.jsx b/zy-acs-flow/src/page/agv/AgvCard.jsx index 7af6f3b..371f758 100644 --- a/zy-acs-flow/src/page/agv/AgvCard.jsx +++ b/zy-acs-flow/src/page/agv/AgvCard.jsx @@ -42,7 +42,7 @@ > <Box display="flex" flexDirection="row" alignItems="center" justifyContent='space-between'> <PulseSignal - flag={true} + flag={record.online} /> <Typography variant="caption" > vol: diff --git a/zy-acs-flow/src/page/agv/AgvList.jsx b/zy-acs-flow/src/page/agv/AgvList.jsx index d4ec3f7..1a8010b 100644 --- a/zy-acs-flow/src/page/agv/AgvList.jsx +++ b/zy-acs-flow/src/page/agv/AgvList.jsx @@ -48,7 +48,7 @@ import { PAGE_DRAWER_WIDTH, OPERATE_MODE } from '@/config/setting'; import * as Common from '@/utils/common'; import { ImageList } from "./GridList"; - +import { AgvListFilter } from "./AgvListFilter"; export const AgvGrid = () => { const { identity } = useGetIdentity(); @@ -80,6 +80,7 @@ return ( <Stack direction="row" component="div"> + <AgvListFilter /> <Stack sx={{ width: '100%' }}> <Title title={"menu.agv"} /> <ListToolbar actions={( diff --git a/zy-acs-flow/src/page/agv/AgvListFilter.jsx b/zy-acs-flow/src/page/agv/AgvListFilter.jsx new file mode 100644 index 0000000..ff658b6 --- /dev/null +++ b/zy-acs-flow/src/page/agv/AgvListFilter.jsx @@ -0,0 +1,28 @@ +import * as React from 'react'; +import { + FilterList, + FilterLiveSearch, + FilterListItem, + useTranslate, +} from 'react-admin'; +import { Box } from '@mui/material'; +import BusinessIcon from '@mui/icons-material/Business'; +import LocalShippingIcon from '@mui/icons-material/LocalShipping'; +import SupervisorAccountIcon from '@mui/icons-material/SupervisorAccount'; + +export const AgvListFilter = () => { + const translate = useTranslate(); + + return ( + <Box width="13em" minWidth="13em" order={-1} mr={2} mt={5}> + <FilterLiveSearch hiddenLabel source='uuid' label={translate('table.field.agv.uuid')} /> + + <FilterList label="Size" icon={<BusinessIcon />}> + </FilterList> + + <FilterList label="Sector" icon={<LocalShippingIcon />}> + </FilterList> + + </Box> + ); +}; diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java index a754666..cc7a045 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java @@ -57,7 +57,7 @@ PageParam<Agv, BaseParam> pageParam = new PageParam<>(baseParam, Agv.class); PageResult<AgvResult> page = agvService.pageRel(pageParam); for (AgvResult result : page.getRecords()) { - result.sync(agvDetailService.selectByAgvId(result.getId()), codeService, taskService); + result.sync(agvDetailService.selectByAgvId(result.getId()), codeService, taskService, agvService); } return R.ok().add(page); } diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java index 85d817e..0bf1c9f 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java @@ -5,6 +5,7 @@ import com.zy.acs.manager.manager.entity.AgvDetail; import com.zy.acs.manager.manager.entity.Task; import com.zy.acs.manager.manager.enums.TaskStsType; +import com.zy.acs.manager.manager.service.AgvService; import com.zy.acs.manager.manager.service.CodeService; import com.zy.acs.manager.manager.service.TaskService; import lombok.Data; @@ -29,12 +30,15 @@ private String code = "-"; + private Boolean online = Boolean.FALSE; + private List<Long> taskIds = new ArrayList<>(); - public void sync(Object obj, CodeService codeService, TaskService taskService) { + public void sync(Object obj, CodeService codeService, TaskService taskService, AgvService agvService) { if (null == obj) return; if (obj instanceof AgvDetail) { AgvDetail agvDetail = (AgvDetail) obj; + this.setOnline(agvService.judgeOnline(agvDetail.getAgvId())); this.setAgvStatus(agvDetail.getStatusDesc()); if (null != agvDetail.getPos()) { this.setPos(String.valueOf(agvDetail.getPos())); diff --git a/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml index 9ddbe77..64a3c34 100644 --- a/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml +++ b/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml @@ -2,39 +2,6 @@ <!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.AgvMapper"> - <!-- 鍏宠仈鏌ヨsql --> - <sql id="selectSql"> - SELECT a.* - FROM man_agv a - <where> - AND a.deleted = 0 - <if test="param.id != null"> - AND a.id = #{param.id} - </if> - <if test="param.uuid != null"> - AND a.uuid = #{param.uuid} - </if> - <if test="param.name != null"> - AND a.name = #{param.name} - </if> - <if test="param.status != null"> - AND a.status = #{param.status} - </if> - <if test="param.createTimeStart != null"> - AND a.create_time >= #{param.createTimeStart} - </if> - <if test="param.createTimeEnd != null"> - AND a.create_time <= #{param.createTimeEnd} - </if> - <if test="param.keywords != null"> - AND ( - a.ip LIKE CONCAT('%', #{param.keywords}, '%') - OR a.memo LIKE CONCAT('%', #{param.keywords}, '%') - ) - </if> - </where> - </sql> - <select id="selectPageRel" resultType="com.zy.acs.manager.manager.controller.result.AgvResult"> select ma.*, @@ -42,6 +9,10 @@ from man_agv ma left join man_agv_detail mad on ma.id = mad.agv_id where 1=1 + and ma.deleted = 0 + <if test="param.uuid != null"> + AND ma.uuid = #{param.uuid} + </if> order by ma.uuid asc </select> -- Gitblit v1.9.1