From 19787c0b4f5f29026c1790bbb043b9186cdd0e11 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 四月 2026 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpStationManagementController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpStationManagementController.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpStationManagementController.java
index 78305ff..d91bc75 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpStationManagementController.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpStationManagementController.java
@@ -3,6 +3,7 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.xiaopeng.api.model.operation.XpElectronicFence;
import com.xiaopeng.api.model.operation.XpStation;
import com.xiaopeng.api.query.operation.XpStationQuery;
import com.xiaopeng.api.vo.account.LoginUser;
@@ -13,6 +14,7 @@
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.security.service.TokenService;
import com.xiaopeng.map.exportExcel.XpStationExportExcel;
+import com.xiaopeng.map.service.XpElectronicFenceService;
import com.xiaopeng.map.service.XpPointService;
import com.xiaopeng.map.service.XpStationService;
import io.swagger.annotations.Api;
@@ -50,12 +52,13 @@
private TokenService tokenService;
@Resource
private XpPointService xpPointService;
+ @Resource
+ private XpElectronicFenceService xpElectronicFenceService;
@ApiOperation(value = "场站管理已经启动列表", tags = {"管理后台-运营-场站管理"})
@GetMapping("/findListEnable")
public R<List<XpStation>> findListByCityCode(@RequestParam String cityCode) {
-
XpStationQuery query = new XpStationQuery();
query.setCityCode(cityCode);
return R.ok( xpStationService.findList(query));
@@ -86,6 +89,14 @@
XpStationVo beanVo = new XpStationVo();
BeanUtils.copyProperties(bean, beanVo);
beanVo.setXpPointList(xpPointService.listByStationId(bean.getId()));
+
+ XpElectronicFence electronicFence = xpElectronicFenceService.getById(bean.getElectronicId());
+
+ beanVo.setFenceEffectType(electronicFence.getEffectType());
+ beanVo.setFenceEffectTime(electronicFence.getEffectTime());
+ beanVo.setFenceFailureType(electronicFence.getFailureType());
+ beanVo.setFenceFailureTime(electronicFence.getFailureTime());
+
return R.ok(beanVo);
}
--
Gitblit v1.7.1