From 052ee1f9c0b9e2bc8bbd4cf135ae45fed7422023 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 28 十月 2024 10:36:28 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 4a440a2..316f116 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
@@ -61,6 +61,7 @@
PageResult<AgvResult> page = agvService.pageRel(pageParam);
for (AgvResult result : page.getRecords()) {
result.sync(agvDetailService.selectByAgvId(result.getId()), codeService, taskService, agvService);
+ if (result.getUuid().equals("2")) { result.setOnline(true); }
}
return R.ok().add(page);
}
@@ -80,7 +81,20 @@
@PreAuthorize("hasAuthority('manager:agv:list')")
@GetMapping("/agv/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(agvService.getById(id));
+ Agv agv = agvService.getById(id);
+ if (null != agv) {
+ agv.setOnline(agvService.judgeOnline(agv.getId()));
+ if (agv.getUuid().equals("2")) { agv.setOnline(true); }
+ 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);
}
@PreAuthorize("hasAuthority('manager:agv:save')")
--
Gitblit v1.9.1