From b7335b1bfc879a0674dd4d710be318e99e2c73b5 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 11 十二月 2025 15:35:38 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
index 17132b5..b546994 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
@@ -13,16 +13,17 @@
import com.zy.acs.manager.common.domain.MapDto;
import com.zy.acs.manager.common.domain.MapRouteDto;
import com.zy.acs.manager.common.exception.BusinessException;
-import com.zy.acs.manager.core.service.PatrolService;
import com.zy.acs.manager.core.domain.BackpackDto;
+import com.zy.acs.manager.core.service.AvoidWaveCalculator;
import com.zy.acs.manager.core.service.MapService;
+import com.zy.acs.manager.core.service.PatrolService;
import com.zy.acs.manager.core.service.floyd.FloydNavigateService;
+import com.zy.acs.manager.manager.controller.param.MapAreaParam;
import com.zy.acs.manager.manager.controller.param.MapDataParam;
import com.zy.acs.manager.manager.controller.param.MapParam;
import com.zy.acs.manager.manager.controller.result.MapAgvVo;
import com.zy.acs.manager.manager.controller.result.MapPointVo;
import com.zy.acs.manager.manager.controller.result.MapRouteVo;
-import com.zy.acs.manager.manager.entity.NavMap;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.AgvStsType;
import com.zy.acs.manager.manager.enums.StatusType;
@@ -72,6 +73,10 @@
private ConfigService configService;
@Autowired
private PatrolService patrolService;
+ @Autowired
+ private AvoidWaveCalculator avoidWaveCalculator;
+ @Autowired
+ private AreaService areaService;
@PreAuthorize("hasAuthority('manager:loc:update')")
@PostMapping("/startupOrShutdown")
@@ -161,7 +166,7 @@
vo.setVol(String.valueOf(agvDetail.getVol()));
vo.setSoc(String.valueOf(agvDetail.getSoc()));
vo.setPos(agvDetail.getPos() != null && agvDetail.getPos() == 1);
- Code code = codeService.getById(agvDetail.getRecentCode());
+ Code code = codeService.getCacheById(agvDetail.getRecentCode());
if (null != code) {
vo.setCode(code.getData());
}
@@ -209,22 +214,6 @@
}
return R.ok().add(result);
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -427,7 +416,7 @@
for (Agv agv : agvList) {
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (null == agvDetail) { continue; }
- Code currCode = codeService.getById(agvDetail.getCode());
+ Code currCode = codeService.getCacheById(agvDetail.getCode());
MapAgvDto agvDto = new MapAgvDto();
agvDto.setUuid(agv.getUuid());
agvDto.setCurrCode(currCode==null?null:currCode.getData());
@@ -437,4 +426,22 @@
return R.ok().add(mapDto);
}
+ // area operate -------------------------
+
+ @PreAuthorize("hasAuthority('manager:loc:list')")
+ @PostMapping("/area/list")
+ public R areaFetch(@RequestParam(required = false) Long zoneId, @RequestParam(required = false) Integer floor) {
+ List<Area> areaList = areaService.list(new LambdaQueryWrapper<Area>().eq(Area::getStatus, StatusType.ENABLE.val));
+
+ return R.ok();
+ }
+
+ @PreAuthorize("hasAuthority('manager:loc:update')")
+ @PostMapping("/area/save")
+ @Transactional
+ public R save(@RequestBody MapAreaParam param) {
+ areaService.saveMapArea(param, getLoginUserId());
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1