From 42b108daf16fd969696a23638481111432ae8ebe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 21 九月 2024 16:19:38 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 9043935..26d2215 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
@@ -14,10 +14,8 @@
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.manager.service.CodeService;
-import com.zy.acs.manager.manager.service.TaskService;
+import com.zy.acs.manager.manager.entity.AgvModel;
+import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -35,6 +33,8 @@
private AgvService agvService;
@Autowired
private AgvDetailService agvDetailService;
+ @Autowired
+ private AgvModelService agvModelService;
@Autowired
private CodeService codeService;
@Autowired
@@ -82,10 +82,15 @@
public R get(@PathVariable("id") Long id) {
Agv agv = agvService.getById(id);
if (null != agv) {
+ agv.setOnline(agvService.judgeOnline(agv.getId()));
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (null != agvDetail) {
agv.setAgvDetail(agvDetail);
}
+ AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
+ if (null != agvModel) {
+ agv.setAgvModelData(agvModel);
+ }
}
return R.ok().add(agv);
}
--
Gitblit v1.9.1