From 6cbb420754e6e29fa134a6afca4514b8dfd62918 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 13 一月 2026 16:14:49 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java
index d174773..e189425 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java
@@ -7,6 +7,7 @@
import com.zy.acs.manager.common.domain.AreaShapeDto;
import com.zy.acs.manager.core.service.AreaGovernService;
import com.zy.acs.manager.manager.controller.param.MapAreaParam;
+import com.zy.acs.manager.manager.controller.result.MapAreaResult;
import com.zy.acs.manager.manager.entity.Area;
import com.zy.acs.manager.manager.entity.AreaAgv;
import com.zy.acs.manager.manager.enums.StatusType;
@@ -19,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
+import java.util.Objects;
@Slf4j
@Service("areaService")
@@ -71,7 +73,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Area modifyMapArea(MapAreaParam param, Long loginUserId) {
+ public MapAreaResult modifyMapArea(MapAreaParam param, Long loginUserId) {
Long areaId = param.getId();
Area area = this.getById(areaId);
@@ -90,18 +92,50 @@
// area
boolean needModify = false;
- if (!Cools.isEmpty(param.getName()) && !area.getName().equals(param.getName())) {
+ if (param.getName() != null && !Objects.equals(area.getName(), param.getName())) {
area.setName(param.getName());
+ needModify = true;
+ }
+ if (param.getCode() != null && !Objects.equals(area.getCode(), param.getCode())) {
+ area.setCode(param.getCode());
+ needModify = true;
+ }
+ if (param.getMaxCount() != null && !Objects.equals(area.getMaxCount(), param.getMaxCount())) {
+ area.setMaxCount(param.getMaxCount());
+ needModify = true;
+ }
+ if (param.getSpeedLimit() != null && !Objects.equals(area.getSpeedLimit(), param.getSpeedLimit())) {
+ area.setSpeedLimit(param.getSpeedLimit());
+ needModify = true;
+ }
+ if (param.getPriority() != null && !Objects.equals(area.getPriority(), param.getPriority())) {
+ area.setPriority(param.getPriority());
+ needModify = true;
+ }
+ if (param.getMemo() != null && !Objects.equals(area.getMemo(), param.getMemo())) {
+ area.setMemo(param.getMemo());
needModify = true;
}
if (needModify) {
+ area.setUpdateTime(new Date());
+ area.setUpdateBy(loginUserId);
if (!this.updateById(area)) {
throw new RuntimeException("failed to update Area");
}
}
- return area;
+ return new MapAreaResult().sync(area);
+ }
+
+ @Override
+ public void removeMapArea(Long areaId, Long loginUserId) {
+ // area - agv
+ areaAgvService.removeByAreaId(areaId);
+ // cache
+ areaGovernService.removeArea(areaId);
+ // db
+ this.removeById(areaId);
}
}
--
Gitblit v1.9.1