From cca3806b5e9072d6736bf2711a5a329fb80855a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 20 九月 2024 10:57:56 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/agv/AgvCard.jsx | 8 ++--
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java | 16 ++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AgvMapper.java | 3 +
zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml | 9 +++-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvService.java | 3 +
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java | 25 +++++++++---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 5 +-
7 files changed, 51 insertions(+), 18 deletions(-)
diff --git a/zy-acs-flow/src/page/agv/AgvCard.jsx b/zy-acs-flow/src/page/agv/AgvCard.jsx
index a226dfc..59766f6 100644
--- a/zy-acs-flow/src/page/agv/AgvCard.jsx
+++ b/zy-acs-flow/src/page/agv/AgvCard.jsx
@@ -21,7 +21,7 @@
if (!record) return null;
console.log(record);
-
+
return (
<Link
@@ -48,13 +48,13 @@
<AgvAvatar />
<Box textAlign="center" marginTop={1}>
<Typography variant="subtitle2">
- {record.name}
+ {record.uuid}
</Typography>
<SelectField
color="textSecondary"
- source="sector"
+ source="uuid"
choices={[
- { id: '1', name: '1' }
+ { id: '1', name: 'sad' }
]}
/>
</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 c5c37d1..2cefcc9 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
@@ -4,13 +4,14 @@
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.common.domain.PageResult;
+import com.zy.acs.manager.common.utils.ExcelUtil;
+import com.zy.acs.manager.manager.controller.result.AgvResult;
import com.zy.acs.manager.manager.entity.Agv;
-import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.service.AgvDetailService;
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.system.controller.BaseController;
@@ -30,18 +31,28 @@
@Autowired
private AgvDetailService agvDetailService;
+// @PreAuthorize("hasAuthority('manager:agv:list')")
+// @PostMapping("/agv/page")
+// public R page(@RequestBody Map<String, Object> map) {
+// BaseParam baseParam = buildParam(map, BaseParam.class);
+// PageParam<Agv, BaseParam> pageParam = new PageParam<>(baseParam, Agv.class);
+// PageParam<Agv, BaseParam> page = agvService.page(pageParam, pageParam.buildWrapper(true));
+// for (Agv agv : page.getRecords()) {
+// AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
+// agv.setAgvDetail(agvDetail);
+// }
+// return R.ok().add(page);
+// }
+
@PreAuthorize("hasAuthority('manager:agv:list')")
@PostMapping("/agv/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Agv, BaseParam> pageParam = new PageParam<>(baseParam, Agv.class);
- PageParam<Agv, BaseParam> page = agvService.page(pageParam, pageParam.buildWrapper(true));
- for (Agv agv : page.getRecords()) {
- AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
- agv.setAgvDetail(agvDetail);
+ PageResult<AgvResult> page = agvService.pageRel(pageParam);
+ for (AgvResult result : page.getRecords()) {
}
return R.ok().add(page);
-// return R.ok().add(agvService.pageRel(pageParam));
}
@PreAuthorize("hasAuthority('manager:agv:list')")
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
new file mode 100644
index 0000000..67178fe
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java
@@ -0,0 +1,16 @@
+package com.zy.acs.manager.manager.controller.result;
+
+import com.zy.acs.manager.manager.entity.Agv;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * Created by vincent on 9/20/2024
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AgvResult extends Agv {
+
+ private Double vol;
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AgvMapper.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AgvMapper.java
index 5d412b6..9c5cc84 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AgvMapper.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AgvMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zy.acs.manager.manager.controller.result.AgvResult;
import com.zy.acs.manager.manager.entity.Agv;
import org.apache.ibatis.annotations.Param;
@@ -16,6 +17,6 @@
*/
public interface AgvMapper extends BaseMapper<Agv> {
- List<Agv> selectPageRel(@Param("page") IPage<Agv> page, @Param("param") Map<String, Object> param);
+ List<AgvResult> selectPageRel(@Param("page") IPage<Agv> page, @Param("param") Map<String, Object> param);
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvService.java
index 25ef445..d60d23c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvService.java
@@ -6,6 +6,7 @@
import com.zy.acs.manager.common.domain.PageParam;
import com.zy.acs.manager.common.domain.PageResult;
import com.zy.acs.manager.core.domain.VehicleDto;
+import com.zy.acs.manager.manager.controller.result.AgvResult;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Task;
@@ -20,7 +21,7 @@
*/
public interface AgvService extends IService<Agv> {
- PageResult<Agv> pageRel(PageParam<Agv, BaseParam> pageParam);
+ PageResult<AgvResult> pageRel(PageParam<Agv, BaseParam> pageParam);
Agv selectByUuid(String uuid);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
index fd096dd..804cd5b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
@@ -11,6 +11,7 @@
import com.zy.acs.manager.common.domain.PageParam;
import com.zy.acs.manager.common.domain.PageResult;
import com.zy.acs.manager.core.domain.VehicleDto;
+import com.zy.acs.manager.manager.controller.result.AgvResult;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.SegmentStateType;
import com.zy.acs.manager.manager.mapper.AgvMapper;
@@ -47,8 +48,8 @@
private SegmentService segmentService;
@Override
- public PageResult<Agv> pageRel(PageParam<Agv, BaseParam> pageParam) {
- return new PageResult<>(this.baseMapper.selectPageRel(pageParam, pageParam.checkoutMap()), pageParam.getTotal());
+ public PageResult<AgvResult> pageRel(PageParam<Agv, BaseParam> pageParam) {
+ return new PageResult<AgvResult>(this.baseMapper.selectPageRel(pageParam, pageParam.checkoutMap()), pageParam.getTotal());
}
@Override
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 d4ea109..4e86772 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml
@@ -35,10 +35,13 @@
</where>
</sql>
- <select id="selectPageRel" resultType="com.zy.acs.manager.manager.entity.Agv">
+ <select id="selectPageRel" resultType="com.zy.acs.manager.manager.controller.result.AgvResult">
select
- *
- from man_agv
+ ma.*,
+ mad.vol
+ from man_agv ma
+ left join man_agv_detail mad on ma.id = mad.agv_id
+ where 1=1
</select>
</mapper>
--
Gitblit v1.9.1