From d0a010eb5d2c4c78f4c97300361fe87855a7c78f Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 11 十二月 2025 16:07:51 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 57 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 25 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 d9329ae..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());
}
@@ -185,7 +190,7 @@
if (Cools.isEmpty(codeData)) {
return R.error();
}
- Code code = codeService.selectByData(codeData);
+ Code code = codeService.getCacheByData(codeData);
MapPointVo vo = new MapPointVo();
vo.setCodeId(code.getId());
vo.setCodeData(code.getData());
@@ -212,22 +217,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@PreAuthorize("hasAuthority('map:save')")
@PostMapping("/save")
@Transactional
@@ -238,7 +227,7 @@
List<Code> codes = codeService.list();
List<Code> codeArr = param.getCodeArr();
for (Code code : codeArr) {
- Code one = codeService.selectByData(code.getData());
+ Code one = codeService.getCacheByData(code.getData());
if (one == null) {
if (!codeService.save(code)) {
throw new BusinessException(code.getData()+" save fail![Code]");
@@ -264,8 +253,8 @@
List<MapParam.Route> routeArr = param.getRouteArr();
for (MapParam.Route paramRoute : routeArr) {
- Code startCode = codeService.selectByData(paramRoute.getStartCode());
- Code endCode = codeService.selectByData(paramRoute.getEndCode());
+ Code startCode = codeService.getCacheByData(paramRoute.getStartCode());
+ Code endCode = codeService.getCacheByData(paramRoute.getEndCode());
Route route = routeService.findByCodeOfBoth(startCode.getId(), endCode.getId());
if (route == null) {
@@ -342,7 +331,7 @@
if (Cools.isEmpty(agvParam.getPos())) {
throw new BusinessException(agvParam.getAgvNo() + " agv not in position锛�");
}
- Code code = codeService.selectByData(agvParam.getPos());
+ Code code = codeService.getCacheByData(agvParam.getPos());
Agv agv = agvService.selectByUuid(agvParam.getAgvNo());
if (agv == null) {
agv = new Agv();
@@ -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