From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpStationManagementController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 dbf5304..ea35e76 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);
}
@@ -117,15 +128,15 @@
if(vo.getId() == null){
return R.fail("参数错误");
}
- xpStationService.validate(vo);
XpStation bean = xpStationService.getById(vo.getId());
if(bean == null){
return R.fail("参数错误");
}
+ xpStationService.validate(vo);
//场站状态 0=草稿 1=待启用 2=启用中 3=已停用 4=失效
- if(bean.getStatus() == 2){
- return R.fail("场站在启动中不能编辑");
- }
+// if(bean.getStatus() == 2){
+// return R.fail("场站在启动中不能编辑");
+// }
LoginUser loginUser = tokenService.getLoginUser();
--
Gitblit v1.7.1