feat(firstleg): expose batch carrier actual facts

2026-09-08 19:09:08 +08:00
parent 75e67fa980
commit b0c81e337d
10 changed files with 182 additions and 0 deletions
@@ -5,6 +5,7 @@ import com.baiyue.common.core.api.ApiResponse;
 import com.baiyue.common.core.api.PageResult;
 import com.baiyue.common.security.AuthenticatedUser;
 import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.CarrierDescriptor;
+import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.ContainerActualFacts;
 import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.CreateRequest;
 import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.Detail;
 import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.ManualResultRequest;
@@ -19,6 +20,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.Size;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.validation.annotation.Validated;
@@ -28,6 +30,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;

 import java.util.List;
@@ -47,6 +50,17 @@ public class PlatformCarrierScheduleQueryController {
        return ApiResponse.success(service.carriers());
    }

+    @Operation(summary = "按货柜批量查询实际船节点摘要",
+        description = "最多200柜；仅返回实际节点时间，不返回或推断预计时间；没有船节点任务的货柜不返回行。")
+    @GetMapping("/container-actual-facts")
+    @PreAuthorize("hasAuthority('platform:firstleg:port-schedule-query:list')")
+    public ApiResponse<List<ContainerActualFacts>> containerActualFacts(
+        @AuthenticationPrincipal AuthenticatedUser user,
+        @RequestParam("containerBookingIds") @Size(min = 1, max = 200) List<@Positive Long> containerBookingIds) {
+        FirstlegScopeGuard.platform(user);
+        return ApiResponse.success(service.containerActualFacts(containerBookingIds));
+    }
+
    @GetMapping
    @PreAuthorize("hasAuthority('platform:firstleg:port-schedule-query:list')")
    public ApiResponse<PageResult<QueryView>> page(@AuthenticationPrincipal AuthenticatedUser user,
@@ -80,6 +80,17 @@ public final class CarrierScheduleQueryDtos {

    public record QueryView(Task query, boolean expired) {}

+    /** Actual-only summary used by container workbenches; estimated facts are intentionally excluded. */
+    public record ContainerActualFacts(Long containerBookingId, Long queryId, Integer queryVersion,
+                                       String queryStatus, String latestActualNode,
+                                       LocalDateTime latestActualAt,
+                                       LocalDateTime departedWarehouseAt,
+                                       LocalDateTime departedOriginPortAt,
+                                       LocalDateTime arrivedDestinationPortAt,
+                                       LocalDateTime pickupReadyAt,
+                                       LocalDateTime pickedUpAt,
+                                       LocalDateTime emptyReturnedAt) {}
+
    public record NodeFact(Long id, String providerCode, String providerEventId,
                           String providerNodeCode, String standardNode,
                           int nodeSequence, LocalDateTime observedAt, LocalDateTime estimatedAt,
@@ -3,6 +3,7 @@ package com.baiyue.firstleg.portschedule.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.Query;
+import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.ContainerActualFacts;
 import com.baiyue.firstleg.portschedule.entity.CarrierScheduleQueryEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -46,6 +47,33 @@ public interface CarrierScheduleQueryMapper extends BaseMapper<CarrierScheduleQu
                                                    @Param("oceanBookingId") long oceanBookingId,
                                                    @Param("containerBookingId") long containerBookingId);

+    @Select("""
+        <script>
+        SELECT q.container_booking_id AS containerBookingId,q.id AS queryId,q.version AS queryVersion,
+               q.status AS queryStatus,q.latest_standard_node AS latestActualNode,
+               q.latest_node_observed_at AS latestActualAt,
+               MAX(CASE WHEN f.standard_node='DEPARTED_WAREHOUSE' THEN f.actual_at END) AS departedWarehouseAt,
+               MAX(CASE WHEN f.standard_node='DEPARTED_ORIGIN_PORT' THEN f.actual_at END) AS departedOriginPortAt,
+               MAX(CASE WHEN f.standard_node='ARRIVED_DESTINATION_PORT' THEN f.actual_at END) AS arrivedDestinationPortAt,
+               MAX(CASE WHEN f.standard_node='PICKUP_READY' THEN f.actual_at END) AS pickupReadyAt,
+               MAX(CASE WHEN f.standard_node='PICKED_UP' THEN f.actual_at END) AS pickedUpAt,
+               MAX(CASE WHEN f.standard_node='EMPTY_RETURNED' THEN f.actual_at END) AS emptyReturnedAt
+          FROM fl_carrier_schedule_query q
+          JOIN (
+                SELECT container_booking_id,MAX(id) AS query_id
+                  FROM fl_carrier_schedule_query
+                 WHERE container_booking_id IN
+                 <foreach collection="containerBookingIds" item="id" open="(" separator="," close=")">#{id}</foreach>
+                 GROUP BY container_booking_id
+          ) latest ON latest.query_id=q.id
+          LEFT JOIN fl_carrier_schedule_node_fact f ON f.query_id=q.id AND f.actual_at IS NOT NULL
+         GROUP BY q.container_booking_id,q.id,q.version,q.status,q.latest_standard_node,q.latest_node_observed_at
+         ORDER BY q.container_booking_id
+        </script>
+        """)
+    List<ContainerActualFacts> selectContainerActualFacts(
+        @Param("containerBookingIds") List<Long> containerBookingIds);
+
    @Select("""
        SELECT * FROM fl_carrier_schedule_query
         WHERE status IN ('READY','MANUAL_REQUIRED')
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baiyue.common.core.api.PageResult;
 import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.Query;
+import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.ContainerActualFacts;
 import com.baiyue.firstleg.portschedule.entity.CarrierScheduleQueryAttemptEntity;
 import com.baiyue.firstleg.portschedule.entity.CarrierScheduleQueryEntity;
 import com.baiyue.firstleg.portschedule.entity.CarrierScheduleQueryHistoryEntity;
@@ -40,6 +41,9 @@ public class CarrierScheduleQueryRepository {
    public CarrierScheduleQueryEntity findByBusinessScope(long customerId, long oceanBookingId, long containerBookingId) {
        return queries.findByBusinessScope(customerId, oceanBookingId, containerBookingId);
    }
+    public List<ContainerActualFacts> containerActualFacts(List<Long> containerBookingIds) {
+        return queries.selectContainerActualFacts(containerBookingIds);
+    }
    public List<CarrierScheduleQueryEntity> due(LocalDateTime now, int limit) { return queries.selectDue(now, limit); }
    public boolean claimLease(long id, String owner, LocalDateTime now, LocalDateTime leaseUntil) {
        return queries.claimLease(id, owner, now, leaseUntil) == 1;
@@ -7,6 +7,7 @@ import com.baiyue.common.core.exception.BizException;
 import com.baiyue.common.event.ContainerNumbers;
 import com.baiyue.firstleg.oceanbooking.entity.OceanBookingEntity;
 import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.CarrierDescriptor;
+import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.ContainerActualFacts;
 import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.CreateRequest;
 import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.Detail;
 import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.ManualResultRequest;
@@ -48,6 +49,7 @@ import java.time.Clock;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.HexFormat;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
@@ -76,6 +78,18 @@ public class CarrierScheduleQueryService {
            source.page(), source.size(), source.total(), source.pages());
    }

+    public List<ContainerActualFacts> containerActualFacts(List<Long> containerBookingIds) {
+        if (containerBookingIds == null || containerBookingIds.isEmpty() || containerBookingIds.size() > 200) {
+            throw badRequest("containerBookingIds数量必须在1到200之间");
+        }
+        Set<Long> unique = new HashSet<>();
+        for (Long id : containerBookingIds) {
+            if (id == null || id <= 0) throw badRequest("containerBookingIds必须全部为正数");
+            if (!unique.add(id)) throw badRequest("containerBookingIds不能包含重复值");
+        }
+        return repository.containerActualFacts(containerBookingIds);
+    }
+
    public Detail detail(long id) { return detail(required(id)); }

    public List<History> history(long id) {