From c07c14d7768098f82807d8598ad3fb5c392bd3c0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 20 九月 2024 14:52:36 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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 67493d1..a754666 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,18 @@
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.service.AgvDetailService;
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 com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,14 +30,36 @@
@Autowired
private AgvService agvService;
+ @Autowired
+ private AgvDetailService agvDetailService;
+ @Autowired
+ private CodeService codeService;
+ @Autowired
+ private TaskService taskService;
+
+// @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);
- return R.ok().add(agvService.page(pageParam, pageParam.buildWrapper(true)));
-// return R.ok().add(agvService.pageRel(pageParam));
+ PageResult<AgvResult> page = agvService.pageRel(pageParam);
+ for (AgvResult result : page.getRecords()) {
+ result.sync(agvDetailService.selectByAgvId(result.getId()), codeService, taskService);
+ }
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:agv:list')")
--
Gitblit v1.9.1