♻️ 删除 DriverWaybillServiceImpl 无用的 IMpUserClient 注入

该字段已无使用点,连带删掉 import 与 11 个测试构造实参;currentDriver 的注释改为只陈述当前归属判据。
This commit is contained in:
2026-10-27 22:15:25 +08:00
parent 48acd6a91e
commit bd97b88054
12 changed files with 1 additions and 28 deletions
@@ -34,7 +34,6 @@ import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.Func;
import org.springblade.system.feign.IMpUserClient;
import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.ExceptionDisposalMapper;
import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
import org.springblade.transport.mapper.WaybillNodePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -152,7 +151,6 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
private final IWaybillService waybillService; private final IWaybillService waybillService;
private final IDriverService driverService; private final IDriverService driverService;
private final IMpUserClient mpUserClient;
private final IProcessConfigService processConfigService; private final IProcessConfigService processConfigService;
private final ITransportVehicleService transportVehicleService; private final ITransportVehicleService transportVehicleService;
private final CertificationGate certificationGate; private final CertificationGate certificationGate;
@@ -923,8 +921,7 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
/** /**
* 当前登录司机:只按登录用户 ID 查司机档案,查不到即「无归属」。 * 当前登录司机:只按登录用户 ID 查司机档案,查不到即「无归属」。
* <p> * <p>
* 曾经查不到档案时按手机号回退匹配 driver.mobile,这让两个同号档案可以互相冒充, * 归属判据:driver_id = 当前登录人的司机档案 id;driver_phone 不参与判定。
* 已删除:手机号在归属链路上不再有任何作用。
*/ */
private Driver currentDriver() { private Driver currentDriver() {
Long userId = AuthUtil.getUserId(); Long userId = AuthUtil.getUserId();
@@ -12,7 +12,6 @@ import org.mockito.MockedStatic;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.jackson.JsonUtil; import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.system.feign.IMpUserClient;
import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.ExceptionDisposalMapper;
import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
import org.springblade.transport.mapper.WaybillNodePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -95,7 +94,6 @@ class DriverNodePunchPhotoTest {
service = new DriverWaybillServiceImpl( service = new DriverWaybillServiceImpl(
waybillService, waybillService,
driverService, driverService,
mock(IMpUserClient.class),
mock(IProcessConfigService.class), mock(IProcessConfigService.class),
mock(ITransportVehicleService.class), mock(ITransportVehicleService.class),
mock(CertificationGate.class), mock(CertificationGate.class),
@@ -7,7 +7,6 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springblade.system.feign.IMpUserClient;
import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.ExceptionDisposalMapper;
import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
import org.springblade.transport.mapper.WaybillNodePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -92,7 +91,6 @@ class DriverPunchFinishFlagTest {
service = new DriverWaybillServiceImpl( service = new DriverWaybillServiceImpl(
waybillService, waybillService,
mock(IDriverService.class), mock(IDriverService.class),
mock(IMpUserClient.class),
mock(IProcessConfigService.class), mock(IProcessConfigService.class),
mock(ITransportVehicleService.class), mock(ITransportVehicleService.class),
mock(CertificationGate.class), mock(CertificationGate.class),
@@ -10,7 +10,6 @@ import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.springblade.core.tool.jackson.JsonUtil; import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.system.feign.IMpUserClient;
import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.ExceptionDisposalMapper;
import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
import org.springblade.transport.mapper.WaybillNodePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -87,7 +86,6 @@ class DriverPunchNodeCardTest {
service = new DriverWaybillServiceImpl( service = new DriverWaybillServiceImpl(
waybillService, waybillService,
mock(IDriverService.class), mock(IDriverService.class),
mock(IMpUserClient.class),
mock(IProcessConfigService.class), mock(IProcessConfigService.class),
mock(ITransportVehicleService.class), mock(ITransportVehicleService.class),
mock(CertificationGate.class), mock(CertificationGate.class),
@@ -14,7 +14,6 @@ import org.mockito.MockedStatic;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.system.feign.IMpUserClient;
import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.ExceptionDisposalMapper;
import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
import org.springblade.transport.mapper.WaybillNodePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -88,7 +87,6 @@ class DriverTripAcceptRejectTest {
service = new DriverWaybillServiceImpl( service = new DriverWaybillServiceImpl(
waybillService, waybillService,
driverService, driverService,
mock(IMpUserClient.class),
mock(IProcessConfigService.class), mock(IProcessConfigService.class),
mock(ITransportVehicleService.class), mock(ITransportVehicleService.class),
certificationGate, certificationGate,
@@ -10,7 +10,6 @@ import org.mockito.ArgumentCaptor;
import org.mockito.MockedStatic; import org.mockito.MockedStatic;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.system.feign.IMpUserClient;
import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.ExceptionDisposalMapper;
import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
import org.springblade.transport.mapper.WaybillNodePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -74,7 +73,6 @@ class DriverTripCardTest {
private IWaybillService waybillService; private IWaybillService waybillService;
private IDriverService driverService; private IDriverService driverService;
private IMpUserClient mpUserClient;
private ITripQueryService tripQueryService; private ITripQueryService tripQueryService;
private WaybillEnroutePunchMapper enroutePunchMapper; private WaybillEnroutePunchMapper enroutePunchMapper;
private WaybillNodePunchMapper nodePunchMapper; private WaybillNodePunchMapper nodePunchMapper;
@@ -94,14 +92,12 @@ class DriverTripCardTest {
void setUp() { void setUp() {
waybillService = mock(IWaybillService.class); waybillService = mock(IWaybillService.class);
driverService = mock(IDriverService.class); driverService = mock(IDriverService.class);
mpUserClient = mock(IMpUserClient.class);
tripQueryService = mock(ITripQueryService.class); tripQueryService = mock(ITripQueryService.class);
enroutePunchMapper = mock(WaybillEnroutePunchMapper.class); enroutePunchMapper = mock(WaybillEnroutePunchMapper.class);
nodePunchMapper = mock(WaybillNodePunchMapper.class); nodePunchMapper = mock(WaybillNodePunchMapper.class);
service = new DriverWaybillServiceImpl( service = new DriverWaybillServiceImpl(
waybillService, waybillService,
driverService, driverService,
mpUserClient,
mock(IProcessConfigService.class), mock(IProcessConfigService.class),
mock(ITransportVehicleService.class), mock(ITransportVehicleService.class),
mock(CertificationGate.class), mock(CertificationGate.class),
@@ -11,7 +11,6 @@ import org.mockito.ArgumentCaptor;
import org.mockito.MockedStatic; import org.mockito.MockedStatic;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.system.feign.IMpUserClient;
import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.ExceptionDisposalMapper;
import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
import org.springblade.transport.mapper.WaybillNodePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -116,7 +115,6 @@ class DriverWaybillAutoCompleteTest {
service = new DriverWaybillServiceImpl( service = new DriverWaybillServiceImpl(
waybillService, waybillService,
driverService, driverService,
mock(IMpUserClient.class),
mock(IProcessConfigService.class), mock(IProcessConfigService.class),
mock(ITransportVehicleService.class), mock(ITransportVehicleService.class),
mock(CertificationGate.class), mock(CertificationGate.class),
@@ -7,7 +7,6 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springblade.system.feign.IMpUserClient;
import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.ExceptionDisposalMapper;
import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
import org.springblade.transport.mapper.WaybillNodePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -73,7 +72,6 @@ class DriverWaybillCardLocationTest {
service = new DriverWaybillServiceImpl( service = new DriverWaybillServiceImpl(
waybillService, waybillService,
mock(IDriverService.class), mock(IDriverService.class),
mock(IMpUserClient.class),
mock(IProcessConfigService.class), mock(IProcessConfigService.class),
mock(ITransportVehicleService.class), mock(ITransportVehicleService.class),
mock(CertificationGate.class), mock(CertificationGate.class),
@@ -7,7 +7,6 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springblade.system.feign.IMpUserClient;
import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.ExceptionDisposalMapper;
import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
import org.springblade.transport.mapper.WaybillNodePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -55,7 +54,6 @@ class DriverWaybillNodePunchTest {
service = new DriverWaybillServiceImpl( service = new DriverWaybillServiceImpl(
mock(IWaybillService.class), mock(IWaybillService.class),
mock(IDriverService.class), mock(IDriverService.class),
mock(IMpUserClient.class),
mock(IProcessConfigService.class), mock(IProcessConfigService.class),
mock(ITransportVehicleService.class), mock(ITransportVehicleService.class),
mock(CertificationGate.class), mock(CertificationGate.class),
@@ -12,7 +12,6 @@ import org.mockito.ArgumentCaptor;
import org.mockito.MockedStatic; import org.mockito.MockedStatic;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.system.feign.IMpUserClient;
import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.ExceptionDisposalMapper;
import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
import org.springblade.transport.mapper.WaybillNodePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -76,7 +75,6 @@ class DriverWaybillOwnershipTest {
service = new DriverWaybillServiceImpl( service = new DriverWaybillServiceImpl(
waybillService, waybillService,
driverService, driverService,
mock(IMpUserClient.class),
mock(IProcessConfigService.class), mock(IProcessConfigService.class),
mock(ITransportVehicleService.class), mock(ITransportVehicleService.class),
mock(CertificationGate.class), mock(CertificationGate.class),
@@ -15,7 +15,6 @@ import org.mockito.ArgumentMatchers;
import org.mockito.MockedStatic; import org.mockito.MockedStatic;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.system.feign.IMpUserClient;
import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.ExceptionDisposalMapper;
import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
import org.springblade.transport.mapper.WaybillNodePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -87,7 +86,6 @@ class DriverWaybillRejectDetachTest {
service = new DriverWaybillServiceImpl( service = new DriverWaybillServiceImpl(
waybillService, waybillService,
driverService, driverService,
mock(IMpUserClient.class),
mock(IProcessConfigService.class), mock(IProcessConfigService.class),
mock(ITransportVehicleService.class), mock(ITransportVehicleService.class),
certificationGate, certificationGate,
@@ -12,7 +12,6 @@ import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic; import org.mockito.MockedStatic;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.system.feign.IMpUserClient;
import org.springblade.transport.mapper.ExceptionDisposalMapper; import org.springblade.transport.mapper.ExceptionDisposalMapper;
import org.springblade.transport.mapper.WaybillEnroutePunchMapper; import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
import org.springblade.transport.mapper.WaybillNodePunchMapper; import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -86,7 +85,6 @@ class DriverWaybillTabStatusTest {
service = new DriverWaybillServiceImpl( service = new DriverWaybillServiceImpl(
waybillService, waybillService,
driverService, driverService,
mock(IMpUserClient.class),
mock(IProcessConfigService.class), mock(IProcessConfigService.class),
mock(ITransportVehicleService.class), mock(ITransportVehicleService.class),
mock(CertificationGate.class), mock(CertificationGate.class),