java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
ouyangxq
2026-10-19 17:56:36 +08:00
parent bb917c954c
commit dcfba1053c
232 changed files with 15655 additions and 6005 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lastleg-service/src/test/java/com/baiyue/lastleg/fleet/exception/FleetHandoverPdaQueryTest.java
+5 -5
View File
@@ -22,7 +22,7 @@ class FleetHandoverPdaQueryTest {
final FleetHandoverPdaQuery service = new FleetHandoverPdaQuery(bindings, trips, history, dispatches, handovers, json);
@BeforeEach void setup() {
var binding = new FleetTripDispatch(); binding.setDispatchNo("PC-A"); binding.setCustomerId("CUSTOMER-A");
var binding = new FleetTripDispatch(); binding.setDispatchNo("PC-A");
binding.setTripId(1L); binding.setTripNo("TR-ONE"); binding.setPackageCount(30);
var trip = new FleetTripEntity(); trip.setId(1L); trip.setTripNo("TR-ONE"); trip.setWarehouseId(92L);
trip.setStatus("IN_TRANSIT"); trip.setRecordVersion(10L);
@@ -31,7 +31,7 @@ class FleetHandoverPdaQueryTest {
{"trip":{"tripNo":"TR-ONE","warehouseId":"92","vehiclePlate":"ORIGINAL","driverName":"原司机"}}
""");
when(history.selectList(any())).thenReturn(List.of(departed));
when(dispatches.transitEvidence("PC-A", false)).thenReturn(new FleetTransitEvidence("PC-A", "CUSTOMER-A", "92", 30, List.of(
when(dispatches.transitEvidence("PC-A", false)).thenReturn(new FleetTransitEvidence("PC-A", "92", 30, List.of(
new FleetTransitEvidence.Delivery(new FleetHandoverPolicy.Delivery("CUSTOMER-A", "PC-A", "DL-DONE", "FBA:ONE", 10, Instant.parse("2026-10-03T01:00:00Z"), List.of()),
"DELIVERED", 2, new FleetTransitEvidence.Transport("ORIGINAL", "原司机", null)),
new FleetTransitEvidence.Delivery(new FleetHandoverPolicy.Delivery("CUSTOMER-A", "PC-A", "DL-PENDING", "FBA:TWO", 20, null, List.of()),
@@ -49,11 +49,11 @@ class FleetHandoverPdaQueryTest {
assertEquals("REPLACEMENT", result.deliveries().get(1).transport().vehiclePlate());
String serialized = json.writeValueAsString(result);
assertFalse(serialized.contains("customerId")); assertFalse(serialized.contains("warehouseId")); assertFalse(serialized.contains("vehicleId"));
verify(handovers).latestForCargo(eq(1L), argThat(value -> value.contains("CUSTOMER-A") && value.contains("PC-A")));
verify(handovers).latestForCargo(eq(1L), argThat(value -> value.contains("PC-A") && !value.contains("customerId")));
verify(dispatches, never()).handover(any(), any());
}
@Test void staleBindingToAnotherCustomerCannotExposeDeliveryResources() {
when(dispatches.transitEvidence("PC-A", false)).thenReturn(new FleetTransitEvidence("PC-A", "CUSTOMER-B", "92", 30, List.of()));
@Test void incompleteTruckEvidenceCannotExposeDeliveryResources() {
when(dispatches.transitEvidence("PC-A", false)).thenReturn(new FleetTransitEvidence("PC-A", "93", 30, List.of()));
assertThrows(org.springframework.web.server.ResponseStatusException.class, () -> service.status(92, "PC-A"));
verifyNoInteractions(history, handovers);
}
lastleg-service/src/test/java/com/baiyue/lastleg/fleet/exception/FleetHandoverTransactionTest.java
+1 -1
View File
@@ -71,7 +71,7 @@ class FleetHandoverTransactionTest {
var inspection = mock(FleetHandoverInspectionService.class);
var cargo = new FleetHandoverPolicy.Cargo("CUSTOMER-A", "PC-A", "item", "pallet", "FBA:ONT8", 10);
var delivery = new FleetHandoverPolicy.Delivery("CUSTOMER-A", "PC-A", "DL-A", "FBA:ONT8", 10, null, List.of());
var evidence = new FleetTransitEvidence("PC-A", "CUSTOMER-A", "92", 10,
var evidence = new FleetTransitEvidence("PC-A", "92", 10,
List.of(new FleetTransitEvidence.Delivery(delivery, "WAIT_DELIVERY", 1, new FleetTransitEvidence.Transport("PLATE-11", "司机", "phone"))));
when(inspection.prepare(anyString(), any(), any(), eq(true))).thenAnswer(call -> new FleetHandoverInspectionService.Prepared(state().getRecordVersion(),
new FleetHandoverPolicy.Inspection(List.of(cargo), List.of(), Set.of("pallet"), new Load(1, BigDecimal.valueOf(100), BigDecimal.valueOf(2))), List.of(evidence)));
lastleg-service/src/test/java/com/baiyue/lastleg/fleet/exception/FleetTransitEvidenceTest.java
+33 -38
View File
@@ -3,7 +3,9 @@ package com.baiyue.lastleg.fleet.exception;
import com.baiyue.lastleg.delivery.entity.DeliveryOrder;
import com.baiyue.lastleg.delivery.entity.OutboundOrder;
import com.baiyue.lastleg.delivery.mapper.*;
import com.baiyue.lastleg.dispatch.entity.DispatchOrder;
import com.baiyue.lastleg.dispatch.entity.DispatchAggregate;
import com.baiyue.lastleg.dispatch.entity.DispatchItem;
import com.baiyue.lastleg.dispatch.repository.DispatchAggregateRepository;
import com.baiyue.lastleg.dispatch.fleet.DispatchFleetAdapter;
import com.baiyue.lastleg.dispatch.mapper.*;
import com.baiyue.lastleg.dispatch.pda.mapper.*;
@@ -17,11 +19,15 @@ import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
class FleetTransitEvidenceTest {
@Test void removingOriginalPhysicalItemDelegatesToDispatchAuthority() {
var service=mock(com.baiyue.lastleg.dispatch.service.DispatchService.class);
org.springframework.test.util.ReflectionTestUtils.setField(adapter,"dispatchService",service);
adapter.removeItem("PC-1",41L);
verify(service).removeItem("PC-1",41L);verifyNoMoreInteractions(service);
@Test void twoCustomersAreReadAsOneTruckWithoutAHeaderOwner() {
var other=new DispatchItem();other.setCustomerId("CUSTOMER-B");other.setPackageCount(3);
when(aggregates.cargo(11)).thenReturn(List.of(item,other));dispatch.setShippedPackageCount(13);
var outbound=new OutboundOrder();outbound.setId(32L);outbound.setCustomerId("CUSTOMER-B");outbound.setDispatchOrderId(11L);outbound.setOverseasWarehouseId("21");outbound.setStatus("OUTBOUNDED");outbound.setPackageCount(3);
var second=new DeliveryOrder();second.setId(42L);second.setDeliveryNo("DL-2");second.setCustomerId("CUSTOMER-B");second.setDispatchOrderId(11L);second.setOutboundOrderId(32L);second.setOverseasWarehouseId("21");second.setPackageCount(3);second.setStatus("DELIVERING");second.setVersion(0L);second.setDestinationType("FBA");second.setDestinationWarehouseCode("LAX9");
when(outbounds.findAllByDispatch(11)).thenReturn(List.of(this.outbound,outbound));when(deliveries.findAllByDispatch(11)).thenReturn(List.of(delivery,second));
var fact=adapter.terminalEvidence("PC-1",false);
assertEquals(List.of("CUSTOMER-A","CUSTOMER-B"),fact.deliveries().stream().map(com.baiyue.lastleg.fleet.trip.FleetDispatchGateway.TerminalDelivery::customerId).toList());
assertEquals(13,fact.shippedPackages());assertFalse(java.util.Arrays.stream(fact.getClass().getRecordComponents()).anyMatch(c->c.getName().equals("customerId")));
}
@BeforeAll static void initializeDeliveryMetadata() {
com.baomidou.mybatisplus.core.metadata.TableInfoHelper.initTableInfo(
@@ -29,41 +35,30 @@ class FleetTransitEvidenceTest {
DeliveryOrder.class);
}
final DispatchOrderMapper orders = mock(DispatchOrderMapper.class);
final OutboundOrderMapper outbounds = mock(OutboundOrderMapper.class);
final DeliveryOrderMapper deliveries = mock(DeliveryOrderMapper.class);
final DeliveryOperationMapper operations = mock(DeliveryOperationMapper.class);
final DispatchPdaWorkflowService workflow = mock(DispatchPdaWorkflowService.class);
final DispatchFleetAdapter adapter = new DispatchFleetAdapter(orders, mock(DispatchPdaTaskMapper.class),
outbounds, deliveries, mock(DispatchItemMapper.class), mock(DispatchPdaPickMapper.class), workflow, operations);
final DispatchOrder dispatch = new DispatchOrder();
final DeliveryOrder delivery = new DeliveryOrder();
final DispatchAggregateRepository aggregates=mock(DispatchAggregateRepository.class);
final OutboundOrderMapper outbounds=mock(OutboundOrderMapper.class);final DeliveryOrderMapper deliveries=mock(DeliveryOrderMapper.class);
final DeliveryOperationMapper operations=mock(DeliveryOperationMapper.class);
final com.baiyue.lastleg.dispatch.service.DispatchAggregateService workflow=mock(com.baiyue.lastleg.dispatch.service.DispatchAggregateService.class);
final DispatchFleetAdapter adapter=new DispatchFleetAdapter(aggregates,outbounds,deliveries,operations,mock(com.baiyue.lastleg.delivery.repository.DispatchCargoSourceRepository.class),workflow,new com.fasterxml.jackson.databind.ObjectMapper().findAndRegisterModules());
final DispatchAggregate dispatch=new DispatchAggregate();final DispatchItem item=new DispatchItem();final OutboundOrder outbound=new OutboundOrder();final DeliveryOrder delivery=new DeliveryOrder();
FleetTransitEvidenceTest() {
dispatch.setId(11L); dispatch.setDispatchNo("PC-1"); dispatch.setCustomerId("CUSTOMER-A");
dispatch.setOverseasWarehouseId("21"); dispatch.setStatus("DEPARTED"); dispatch.setShippedPackageCount(10);
var outbound = new OutboundOrder(); outbound.setId(31L); outbound.setStatus("OUTBOUNDED"); outbound.setPackageCount(10);
delivery.setId(41L); delivery.setDeliveryNo("DL-1"); delivery.setCustomerId("CUSTOMER-A");
delivery.setDispatchOrderId(11L); delivery.setOutboundOrderId(31L); delivery.setOverseasWarehouseId("21");
delivery.setPackageCount(10); delivery.setStatus("WAIT_DELIVERY"); delivery.setVersion(0L);
delivery.setDestinationType("FBA"); delivery.setDestinationWarehouseCode("ONT8");
when(orders.findGlobalByDispatchNo("PC-1")).thenReturn(dispatch);
when(orders.lockGlobalByDispatchNo("PC-1")).thenReturn(dispatch);
when(outbounds.findByDispatch("CUSTOMER-A", 11L)).thenReturn(outbound);
when(outbounds.lockByDispatch("CUSTOMER-A", 11L)).thenReturn(outbound);
when(deliveries.findByOutbound("CUSTOMER-A", 31L)).thenReturn(List.of(delivery));
when(deliveries.lockByOutbound("CUSTOMER-A", 31L)).thenReturn(List.of(delivery));
dispatch.setId(11L);dispatch.setDispatchNo("PC-1");dispatch.setOverseasWarehouseId("21");dispatch.setStatus("ACTIVE");dispatch.setStage("DELIVERING");dispatch.setDepartedAt(LocalDateTime.now(java.time.ZoneOffset.UTC).minusDays(1));dispatch.setShippedPackageCount(10);
item.setCustomerId("CUSTOMER-A");item.setPackageCount(10);when(aggregates.cargo(11)).thenReturn(List.of(item));
outbound.setId(31L);outbound.setCustomerId("CUSTOMER-A");outbound.setDispatchOrderId(11L);outbound.setOverseasWarehouseId("21");outbound.setStatus("OUTBOUNDED");outbound.setPackageCount(10);
delivery.setId(41L);delivery.setDeliveryNo("DL-1");delivery.setCustomerId("CUSTOMER-A");delivery.setDispatchOrderId(11L);delivery.setOutboundOrderId(31L);delivery.setOverseasWarehouseId("21");delivery.setPackageCount(10);delivery.setStatus("DELIVERING");delivery.setVersion(0L);delivery.setDestinationType("FBA");delivery.setDestinationWarehouseCode("ONT8");
when(aggregates.find("PC-1")).thenReturn(dispatch);when(aggregates.lock("PC-1")).thenReturn(dispatch);
when(outbounds.findAllByDispatch(11)).thenReturn(List.of(outbound));when(outbounds.lockAllByDispatch(11)).thenReturn(List.of(outbound));
when(deliveries.findAllByDispatch(11)).thenReturn(List.of(delivery));when(deliveries.lockAllByDispatch(11)).thenReturn(List.of(delivery));
}
@Test void unresolvedReturnKeepsCargoAndUsesCustomerScopedLocks() {
delivery.setStatus("RETURN_PENDING");
var fact = adapter.transitEvidence("PC-1", true);
assertNull(fact.deliveries().get(0).cargo().terminalAt());
assertEquals("FBA:ONT8", fact.deliveries().get(0).cargo().destinationKey());
var order = inOrder(orders, outbounds, deliveries);
order.verify(orders).lockGlobalByDispatchNo("PC-1");
order.verify(outbounds).lockByDispatch("CUSTOMER-A", 11L);
order.verify(deliveries).lockByOutbound("CUSTOMER-A", 31L);
var order = inOrder(aggregates, outbounds, deliveries);
order.verify(aggregates).lock("PC-1");
order.verify(outbounds).lockAllByDispatch(11);
order.verify(deliveries).lockAllByDispatch(11);
verifyNoInteractions(workflow);
}
@@ -85,7 +80,7 @@ class FleetTransitEvidenceTest {
assertEquals(returned.atZone(ZoneId.systemDefault()).toInstant(),
adapter.transitEvidence("PC-1", false).deliveries().get(0).cargo().terminalAt());
var terminal=adapter.terminalEvidence("PC-1",false);
assertEquals("CUSTOMER-A",terminal.customerId());assertEquals(10,terminal.shippedPackages());
assertEquals("CUSTOMER-A",terminal.deliveries().get(0).customerId());assertEquals(10,terminal.shippedPackages());
var returnedDelivery=terminal.deliveries().get(0);
assertEquals("FBA:ONT8",returnedDelivery.destinationKey());assertEquals(10,returnedDelivery.packages());
assertEquals(returned.atZone(ZoneId.systemDefault()).toInstant(),returnedDelivery.terminalAt());
@@ -103,9 +98,9 @@ class FleetTransitEvidenceTest {
}
@Test void preDepartureAndCancelledDeliveryCannotBecomeHandoverCargo() {
dispatch.setStatus("READY_TO_DEPART");
dispatch.setStage("AFTER_LOADING");
assertThrows(org.springframework.web.server.ResponseStatusException.class, () -> adapter.transitEvidence("PC-1", false));
dispatch.setStatus("DEPARTED"); delivery.setStatus("CANCELLED");
dispatch.setStage("DELIVERING"); delivery.setStatus("CANCELLED");
assertThrows(org.springframework.web.server.ResponseStatusException.class, () -> adapter.transitEvidence("PC-1", false));
}
@@ -115,7 +110,7 @@ class FleetTransitEvidenceTest {
when(deliveries.update(isNull(), any())).thenReturn(1);
adapter.handover(evidence, new com.baiyue.lastleg.fleet.trip.FleetDispatchGateway.Assignment("NEW-PLATE", "接替司机", "phone"));
verify(deliveries).update(isNull(), any());
verify(orders, never()).update(any(), any());
verify(aggregates, never()).saveState(any(), anyLong());
verifyNoInteractions(workflow);
}