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 | 5 ++++- 1 files changed, 4 insertions(+), 1 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 18ec049..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 @@ -15,6 +15,7 @@ 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; @@ -33,6 +34,8 @@ private AgvDetailService agvDetailService; @Autowired private CodeService codeService; + @Autowired + private TaskService taskService; // @PreAuthorize("hasAuthority('manager:agv:list')") // @PostMapping("/agv/page") @@ -54,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); + result.sync(agvDetailService.selectByAgvId(result.getId()), codeService, taskService); } return R.ok().add(page); } -- Gitblit v1.9.1