From 9f19c2ea1a1d4e94460eb2d881b7cf8cc10e66df Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 14 十一月 2024 10:42:10 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 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 d47ab68..29aa88f 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,6 +13,7 @@
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.MapService;
import com.zy.acs.manager.core.service.floyd.FloydNavigateService;
@@ -21,11 +22,11 @@
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.Map;
+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.TaskStsType;
-import com.zy.acs.manager.manager.mapper.MapMapper;
+import com.zy.acs.manager.manager.mapper.NavMapMapper;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.controller.BaseController;
import com.zy.acs.manager.system.service.ConfigService;
@@ -61,13 +62,15 @@
@Autowired
private TaskService taskService;
@Autowired
- private MapMapper mapMapper;
+ private NavMapMapper navMapMapper;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private LocService locService;
@Autowired
private ConfigService configService;
+ @Autowired
+ private PatrolService patrolService;
@PreAuthorize("hasAuthority('manager:loc:update')")
@PostMapping("/startupOrShutdown")
@@ -92,11 +95,11 @@
mapCodeItems.add(mapItem);
});
// common
- Map activeMap = mapMapper.selectActive(zoneId, floor);
+ NavMap activeNavMap = navMapMapper.selectActive(zoneId, floor);
return R.ok().add(Cools
.add("rcsStatus", configService.getVal("TaskAssignMode", Boolean.class))
.add("point", GsonUtils.toJson(mapCodeItems))
- .add("common", activeMap.getData())
+ .add("common", null != activeNavMap ? activeNavMap.getData() : null)
);
}
@@ -107,25 +110,25 @@
Date now = new Date();
Long userId = getLoginUserId();
// previous
- Map previousMap = mapMapper.selectActive(param.getZoneId(), param.getFloor());
- if (null != previousMap) {
- previousMap.setActive(0);
- previousMap.setUpdateTime(now);
- previousMap.setUpdateBy(userId);
- if (0 == mapMapper.updateById(previousMap)) {
+ NavMap previousNavMap = navMapMapper.selectActive(param.getZoneId(), param.getFloor());
+ if (null != previousNavMap) {
+ previousNavMap.setActive(0);
+ previousNavMap.setUpdateTime(now);
+ previousNavMap.setUpdateBy(userId);
+ if (0 == navMapMapper.updateById(previousNavMap)) {
throw new CoolException("Save Fail");
}
}
// current
- Map map = new Map();
- map.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
- map.setZoneId(param.getZoneId());
- map.setFloor(param.getFloor());
- map.setData(GsonUtils.toJson(param.getItemList()));
- map.setActive(1);
- map.setUpdateBy(userId);
- map.setCreateBy(userId);
- if (0 == mapMapper.insert(map)) {
+ NavMap navMap = new NavMap();
+ navMap.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
+ navMap.setZoneId(param.getZoneId());
+ navMap.setFloor(param.getFloor());
+ navMap.setData(GsonUtils.toJson(param.getItemList()));
+ navMap.setActive(1);
+ navMap.setUpdateBy(userId);
+ navMap.setCreateBy(userId);
+ if (0 == navMapMapper.insert(navMap)) {
throw new CoolException("Save Fail");
}
return R.ok("Save Success");
@@ -160,6 +163,7 @@
vo.setCode(codeService.getById(agvDetail.getRecentCode()).getData());
vo.setDirection(agvDetail.getAgvAngle());
vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));
+ vo.setPatrol(patrolService.isPatrolling(agvNo));
}
List<Task> tasks = taskService.selectInSts(agv.getId(), TaskStsType.WAITING, TaskStsType.ASSIGN, TaskStsType.PROGRESS);
if (!Cools.isEmpty(tasks)) {
--
Gitblit v1.9.1