From a4d696725ae8e44a5c3dcade4ea65ff3310092e9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 23 四月 2026 15:50:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointSituationReportServiceImpl.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointSituationReportServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointSituationReportServiceImpl.java
index b8915b2..13440a5 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointSituationReportServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointSituationReportServiceImpl.java
@@ -1,5 +1,8 @@
package com.xiaopeng.operation.service.impl;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xiaopeng.api.feignClient.account.XpOperationUserClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetOperationsClient;
@@ -13,6 +16,7 @@
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.operation.mapper.XpPointSituationReportMapper;
import com.xiaopeng.operation.service.IXpPointSituationReportService;
+import net.bytebuddy.implementation.bytecode.Throw;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -34,6 +38,18 @@
@Override
public PageInfo<XpPointSituationReportVo> pageList(XpPointSituationReportQuery query) {
+ //根据 上报运维人名称 查询数据
+ if(StrUtil.isNotBlank(query.getOperationsUserName())){
+ R<List<XpOperationsUser>> listR = xpOperationUserClient.listByName(query.getOperationsUserName());
+ if(CollUtil.isNotEmpty(listR.getData())){
+ List<Long> operationsUserIds = listR.getData().stream()
+ .map(XpOperationsUser::getId)
+ .collect(Collectors.toList());
+ query.setOperationsUserIds(operationsUserIds);
+ }else{
+ query.setOperationsUserIds(ListUtil.toList(0L));
+ }
+ }
// 创建分页对象
PageInfo<XpPointSituationReportVo> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
// 调用Mapper查询
@@ -125,14 +141,14 @@
@Override
- public void deleteById(Long id) {
+ public boolean deleteById(Long id) {
// 1. 检查记录是否存在
XpPointSituationReport bean = this.getById(id);
if (bean == null) {
- throw new ServiceException("密支付策略配置不存在");
+ throw new ServiceException("点位现场情况上报信息不存在");
}
// 2. 逻辑删除(MyBatis-Plus自动处理)
- this.removeById(id);
+ return super.removeById( bean.getId());
}
}
--
Gitblit v1.7.1