From efabc6ba991acfd01d38bb0bf4e8cfd772416617 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 05 一月 2026 13:07:39 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 93ad8dd..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,8 +92,28 @@
// 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;
}
@@ -110,7 +131,7 @@
@Override
public void removeMapArea(Long areaId, Long loginUserId) {
// area - agv
- areaAgvService.remove(new LambdaQueryWrapper<AreaAgv>().eq(AreaAgv::getAreaId, areaId));
+ areaAgvService.removeByAreaId(areaId);
// cache
areaGovernService.removeArea(areaId);
// db
--
Gitblit v1.9.1