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-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
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')")
--
Gitblit v1.9.1