From 80f5003a640db7795d69c5e3a73caa685c289b80 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期三, 14 一月 2026 16:27:38 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 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 0ce1717..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
@@ -20,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
+import java.util.Objects;
@Slf4j
@Service("areaService")
@@ -91,12 +92,34 @@
// 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");
}
@@ -105,4 +128,14 @@
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