From fd57d8b98cec959ee82a79fa34cbbdc81a0cb514 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 四月 2026 23:11:06 +0800
Subject: [PATCH] 修改bug
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java
index ef1ea11..61e0fdf 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java
@@ -64,8 +64,6 @@
@Resource
private XpOperationUserClient xpOperationsUserClient;
- @Resource
- private XpCruiseCheckInRuleOperationsUserMapper xpCruiseCheckInRuleOperationsUserMapper;
@@ -73,7 +71,7 @@
@Override
public AppXpCruiseCheckInRuleVo getMyXpCruiseCheckInRule(Long uid) {
List<XpCruiseCheckInRule> list = this.list(new LambdaQueryWrapper<XpCruiseCheckInRule>().eq(XpCruiseCheckInRule::getDeleted, 0)
- .last(" and (now() BETWEEN start_time and end_time or cyclic_mode = 1)"));
+ .eq(XpCruiseCheckInRule::getOperationsUserId, uid).last(" and (now() BETWEEN start_time and end_time or cyclic_mode = 1)"));
if(list.isEmpty()){
return null;
}
@@ -284,12 +282,17 @@
List<XpOperationsUser> data = xpOperationsUserClient.getByPhoneNumber(dto.getPhoneNumber()).getData();
ids.addAll(data.stream().map(XpOperationsUser::getId).collect(Collectors.toList()));
}
- if(!ids.isEmpty()){
- List<XpCruiseCheckInRuleOperationsUser> operationsUserId = xpCruiseCheckInRuleOperationsUserMapper.selectList(new QueryWrapper<XpCruiseCheckInRuleOperationsUser>().in("operations_user_id", ids));
- List<Integer> ruleIds = operationsUserId.stream().map(XpCruiseCheckInRuleOperationsUser::getCruiseCheckInRuleId).collect(Collectors.toList());
- dto.setIds(ruleIds);
- }
+ dto.setOperationsUserIds(ids);
List<XpCruiseCheckInRuleListPage> xpCruiseCheckInRuleListPage = this.baseMapper.getXpCruiseCheckInRuleListPage(pageInfo, dto);
+ for (XpCruiseCheckInRuleListPage cruiseCheckInRuleListPage : xpCruiseCheckInRuleListPage) {
+ long count = xpCruiseCheckInRuleLocationService.count(new LambdaQueryWrapper<XpCruiseCheckInRuleLocation>()
+ .eq(XpCruiseCheckInRuleLocation::getCruiseCheckInRuleId, cruiseCheckInRuleListPage.getId()));
+ cruiseCheckInRuleListPage.setPointNum(count);
+ XpOperationsUser xpOperationsUser = xpOperationsUserClient.queryById(cruiseCheckInRuleListPage.getOperationsUserId()).getData();
+ cruiseCheckInRuleListPage.setUserName(xpOperationsUser.getNickName());
+ cruiseCheckInRuleListPage.setPhone(xpOperationsUser.getPhoneNumber());
+ cruiseCheckInRuleListPage.setRoleName(xpOperationsUser.getRoleName());
+ }
return xpCruiseCheckInRuleListPage;
}
@@ -307,17 +310,12 @@
XpCruiseCheckInRule xpCruiseCheckInRule = new XpCruiseCheckInRule();
BeanUtils.copyProperties(dto, xpCruiseCheckInRule);
xpCruiseCheckInRule.setDeleted(false);
+ xpCruiseCheckInRule.setOperationsUserId(dto.getRelationId());
this.save(xpCruiseCheckInRule);
dto.getPoints().forEach(s->{
s.setCruiseCheckInRuleId(xpCruiseCheckInRule.getId());
});
xpCruiseCheckInRuleLocationService.saveBatch(dto.getPoints());
- Long relationId = dto.getRelationId();
-
- XpCruiseCheckInRuleOperationsUser xpCruiseCheckInRuleOperationsUser = new XpCruiseCheckInRuleOperationsUser();
- xpCruiseCheckInRuleOperationsUser.setCruiseCheckInRuleId(xpCruiseCheckInRule.getId());
- xpCruiseCheckInRuleOperationsUser.setOperationsUserId(relationId);
- xpCruiseCheckInRuleOperationsUserMapper.insert(xpCruiseCheckInRuleOperationsUser);
}
--
Gitblit v1.7.1