From 1195f70c061d9205837eb731f24e1a3e34747c87 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 19 十二月 2025 13:20:52 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java | 37 +++++--------------------------------
1 files changed, 5 insertions(+), 32 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 f3bace4..9d56a6b 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
@@ -43,21 +43,6 @@
private TaskService taskService;
@Autowired
private MapDataDispatcher mapDataDispatcher;
- @Autowired
- private AreaAgvService areaAgvService;
-
-// @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")
@@ -89,7 +74,6 @@
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);
@@ -134,30 +118,19 @@
@OperationLog("Update Agv")
@PostMapping("/agv/update")
public R update(@RequestBody Agv agv) {
- if (agvService.count(new LambdaQueryWrapper<Agv>()
- .eq(Agv::getUuid, agv.getUuid())
- .ne(Agv::getId, agv.getId())) > 0) {
- return R.error("Update Fail");
- }
- agv.setUpdateBy(getLoginUserId());
- agv.setUpdateTime(new Date());
- if (!agvService.updateById(agv)) {
- return R.error("Update Fail");
- }
- return R.ok("Update Success").add(agv);
+ return R.ok("Update Success").add(agvService.modify(agv, getLoginUserId()));
}
@PreAuthorize("hasAuthority('manager:agv:remove')")
@OperationLog("Delete Agv")
@PostMapping("/agv/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
+ Long userId = getLoginUserId();
+ List<Long> agvIds = new ArrayList<>();
for (Long agvId : ids) {
- areaAgvService.removeByAgvId(agvId);
+ agvIds.add(agvService.delete(agvId, userId));
}
- if (!agvService.removeByIds(Arrays.asList(ids))) {
- return R.error("Delete Fail");
- }
- return R.ok("Delete Success").add(ids);
+ return R.ok("Delete Success").add(agvIds);
}
@PreAuthorize("hasAuthority('manager:agv:list')")
--
Gitblit v1.9.1