From 3b5a2830f5d450706c279ba8bf38feffa5e30171 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 13 二月 2026 15:38:33 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpElectronicFenceServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpElectronicFenceServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpElectronicFenceServiceImpl.java
index 38a6509..7290c0c 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpElectronicFenceServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpElectronicFenceServiceImpl.java
@@ -11,6 +11,7 @@
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.utils.DateUtils;
+import com.xiaopeng.common.core.utils.StringUtils;
import com.xiaopeng.common.core.utils.bean.BeanUtils;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.operation.constant.I18nKeyConstant;
@@ -65,6 +66,9 @@
@Override
public PageInfo<XpElectronicFence> pageList(ElectronicPageListQuery query) {
PageInfo<XpElectronicFence> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ if (StringUtils.isEmpty(query.getCreateSort())&& StringUtils.isEmpty(query.getUpdateSort())){
+ query.setCreateSort("2");
+ }
List<XpElectronicFence> list = this.baseMapper.pageList(pageInfo, query);
if (list.isEmpty()) {
return new PageInfo<>();
@@ -78,7 +82,9 @@
if (xpElectronicFenceAreas != null) {
xpElectronicFence.setOperatingAreaCount(xpElectronicFenceAreas.stream().filter(xpElectronicFenceArea -> xpElectronicFenceArea.getAreaType() == 1).count());
xpElectronicFence.setProhibitedAreaCount(xpElectronicFenceAreas.stream().filter(xpElectronicFenceArea -> xpElectronicFenceArea.getAreaType() == 2).count());
-
+ }else{
+ xpElectronicFence.setOperatingAreaCount(0L);
+ xpElectronicFence.setProhibitedAreaCount(0L);
}
}
pageInfo.setRecords(list);
@@ -194,6 +200,7 @@
for (XpElectronicFenceArea area : newElectronicFenceAreas) {
area.setElectronicId(xpElectronicFence.getId());
area.setAreaStatus(1);
+ area.setArea(area.getArea());
area.setCityCode(dto.getCityCode());
xpElectronicFenceAreaMapper.insert(area);
@@ -333,6 +340,7 @@
for (XpElectronicFenceArea area : updatedElectronicFenceAreas) {
area.setElectronicId(dto.getId()); // 设置关联的电子围栏ID
area.setCityCode(dto.getCityCode());
+ area.setArea(area.getArea());
xpElectronicFenceAreaMapper.insert(area);
}
if (dto.getStatus() == 2) {
--
Gitblit v1.7.1