优化

firstleg/src/main/java/com/baiyue/firstleg/portschedule/service/CarrierScheduleNodeOutboxService.java

@@ -0,0 +1,75 @@
+package com.baiyue.firstleg.portschedule.service;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baiyue.common.core.api.ResultCode;
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.common.event.EventEnvelope;
+import com.baiyue.common.event.EventIdentifiers;
+import com.baiyue.common.event.EventPayloadCanonicalizer;
+import com.baiyue.common.event.EventPayloadHash;
+import com.baiyue.common.event.EventTypes;
+import com.baiyue.common.event.FirstLegContainerShippingNodeRecordedV1;
+import com.baiyue.common.event.RegionCode;
+import com.baiyue.firstleg.entity.InboundOutboxEntity;
+import com.baiyue.firstleg.mapper.InboundOutboxMapper;
+import com.baiyue.firstleg.portschedule.entity.CarrierScheduleNodeFactEntity;
+import com.baiyue.firstleg.portschedule.entity.CarrierScheduleQueryEntity;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.annotation.Resource;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+
+/** Writes actual carrier node facts to the domestic transactional Outbox. */
+@Service
+public class CarrierScheduleNodeOutboxService {
+    @Resource private InboundOutboxMapper outbox;
+    @Resource private ObjectMapper objectMapper;
+    @Value("${baiyue.carrier-schedule.scheduler.zone:Asia/Shanghai}")
+    private String scheduleZone = "Asia/Shanghai";
+
+    public void publish(CarrierScheduleQueryEntity query, CarrierScheduleNodeFactEntity fact,
+                        String containerNo) {
+        if (fact.getActualAt() == null) return;
+        ZoneId zone = ZoneId.of(scheduleZone);
+        var payload = new FirstLegContainerShippingNodeRecordedV1(
+            string(query.getId()), string(query.getCustomerId()), string(query.getOceanBookingId()),
+            string(query.getContainerBookingId()), containerNo, fact.getStandardNode(), fact.getNodeSequence(),
+            fact.getObservedAt().atZone(zone).toInstant(), fact.getActualAt().atZone(zone).toInstant(),
+            fact.getLocationCode(), fact.getLocationName(), fact.getProviderCode(), fact.getProviderEventId(),
+            fact.getProviderNodeCode(), fact.getSourceReference(), fact.getRawPayloadHash());
+        JsonNode payloadNode = objectMapper.valueToTree(payload);
+        String payloadHash = EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(payloadNode));
+        long aggregateVersion = Math.max(0, query.getVersion() == null ? 0 : query.getVersion());
+        String eventKey = "CARRIER_NODE:" + query.getId() + ':' + fact.getId();
+        EventEnvelope envelope = new EventEnvelope(EventIdentifiers.newUuid(),
+            EventTypes.FIRST_LEG_CONTAINER_SHIPPING_NODE_RECORDED, 1,
+            fact.getActualAt().atZone(zone).toInstant(), RegionCode.CN, RegionCode.OVERSEAS,
+            string(query.getCustomerId()), "CONTAINER_BOOKING", string(query.getContainerBookingId()),
+            aggregateVersion, aggregateVersion + 1, EventIdentifiers.newUuid(), eventKey, null,
+            payloadNode, payloadHash).requireValid();
+
+        InboundOutboxEntity row = new InboundOutboxEntity();
+        row.setId(IdWorker.getId()); row.setTenantId(query.getCustomerId());
+        row.setAggregateType(envelope.aggregateType()); row.setAggregateId(query.getContainerBookingId());
+        row.setEventType(envelope.eventType()); row.setEventKey(eventKey); row.setEventVersion(1);
+        row.setAggregateSequence(Math.toIntExact(aggregateVersion)); row.setPayloadHash(payloadHash);
+        row.setPayloadJson(json(envelope)); row.setPublishStatus("PENDING"); row.setRetryCount(0);
+        row.setCreatedAt(LocalDateTime.now());
+        try { outbox.insert(row); } catch (DuplicateKeyException ignored) { }
+    }
+
+    private String json(Object value) {
+        try { return objectMapper.writeValueAsString(value); }
+        catch (JsonProcessingException exception) {
+            throw new BizException(ResultCode.INTERNAL_ERROR, "船节点交接事件序列化失败");
+        }
+    }
+
+    private static String string(Long value) { return value == null ? null : String.valueOf(value); }
+}

firstleg/src/main/java/com/baiyue/firstleg/repository/LoadingCompletedOutboxRepository.java

@@ -13,11 +13,14 @@ import java.util.List;
 
 @Repository
 public class LoadingCompletedOutboxRepository {
+    private static final List<String> CROSS_REGION_EVENT_TYPES = List.of(
+        EventTypes.FIRST_LEG_LOADING_PLAN_COMPLETED,
+        EventTypes.FIRST_LEG_CONTAINER_SHIPPING_NODE_RECORDED);
     @Resource private InboundOutboxMapper mapper;
 
     public List<InboundOutboxEntity> pending(int limit, LocalDateTime now, LocalDateTime expiredLeaseBefore) {
         return mapper.selectList(new LambdaQueryWrapper<InboundOutboxEntity>()
-            .eq(InboundOutboxEntity::getEventType, EventTypes.FIRST_LEG_LOADING_PLAN_COMPLETED)
+            .in(InboundOutboxEntity::getEventType, CROSS_REGION_EVENT_TYPES)
             .and(status -> status.eq(InboundOutboxEntity::getPublishStatus, "PENDING")
                 .and(retry -> retry.isNull(InboundOutboxEntity::getNextRetryAt)
                     .or().le(InboundOutboxEntity::getNextRetryAt, now))
@@ -29,7 +32,7 @@ public class LoadingCompletedOutboxRepository {
     public boolean claim(long id, String worker, LocalDateTime now, LocalDateTime expiredLeaseBefore) {
         return mapper.update(null, new LambdaUpdateWrapper<InboundOutboxEntity>()
         .eq(InboundOutboxEntity::getId, id)
-        .eq(InboundOutboxEntity::getEventType, EventTypes.FIRST_LEG_LOADING_PLAN_COMPLETED)
+        .in(InboundOutboxEntity::getEventType, CROSS_REGION_EVENT_TYPES)
         .and(status -> status.eq(InboundOutboxEntity::getPublishStatus, "PENDING")
             .or(stale -> stale.eq(InboundOutboxEntity::getPublishStatus, "PROCESSING")
                 .le(InboundOutboxEntity::getLockedAt, expiredLeaseBefore)))
@@ -37,7 +40,7 @@ public class LoadingCompletedOutboxRepository {
         .set(InboundOutboxEntity::getLockedAt, now)) == 1;
     }
     public InboundOutboxEntity claimed(long id, String worker) { return mapper.selectOne(new LambdaQueryWrapper<InboundOutboxEntity>()
-        .eq(InboundOutboxEntity::getId, id).eq(InboundOutboxEntity::getEventType, EventTypes.FIRST_LEG_LOADING_PLAN_COMPLETED)
+        .eq(InboundOutboxEntity::getId, id).in(InboundOutboxEntity::getEventType, CROSS_REGION_EVENT_TYPES)
         .eq(InboundOutboxEntity::getPublishStatus, "PROCESSING").eq(InboundOutboxEntity::getLockedBy, worker)); }
     public void published(long id, String worker, LocalDateTime now) { mapper.update(null, claimedBase(id, worker)
         .set(InboundOutboxEntity::getPublishStatus, "PUBLISHED").set(InboundOutboxEntity::getPublishedAt, now)
@@ -48,7 +51,7 @@ public class LoadingCompletedOutboxRepository {
         .set(InboundOutboxEntity::getNextRetryAt, retryAt).set(InboundOutboxEntity::getLockedBy, null)
         .set(InboundOutboxEntity::getLockedAt, null).set(InboundOutboxEntity::getLastError, truncate(error))); }
     private LambdaUpdateWrapper<InboundOutboxEntity> base(long id, String status) { return new LambdaUpdateWrapper<InboundOutboxEntity>()
-        .eq(InboundOutboxEntity::getId,id).eq(InboundOutboxEntity::getEventType,EventTypes.FIRST_LEG_LOADING_PLAN_COMPLETED)
+        .eq(InboundOutboxEntity::getId,id).in(InboundOutboxEntity::getEventType,CROSS_REGION_EVENT_TYPES)
         .eq(InboundOutboxEntity::getPublishStatus,status); }
     private LambdaUpdateWrapper<InboundOutboxEntity> claimedBase(long id,String worker) { return base(id,"PROCESSING").eq(InboundOutboxEntity::getLockedBy,worker); }
     private static String truncate(String value) { if(value==null)return "unknown"; String v=value.replaceAll("[\\r\\n\\t]+"," "); return v.length()>500?v.substring(0,500):v; }

firstleg/src/main/java/com/baiyue/firstleg/service/LoadingCompletedOutboxRelay.java

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
 import java.time.LocalDateTime;
 import java.util.UUID;
 
-/** 至少一次投递装柜完成跨区事件；事件桥按 eventId 幂等接收。 */
+/** 至少一次投递国内头程跨区事件；事件桥按 eventId + payloadHash 幂等接收。 */
 @Component @Slf4j
 public class LoadingCompletedOutboxRelay {
     @Resource private LoadingCompletedOutboxRepository repository;
@@ -39,12 +39,13 @@ public class LoadingCompletedOutboxRelay {
                 EventEnvelopeValidator.requireValid(event);
                 var response=client.receive(internalToken,event);
                 if(response==null || !response.successful() || response.data()==null
-                    || !event.eventId().equals(response.data().eventId())) throw new IllegalStateException("事件桥未确认装柜完成事件");
+                    || !event.eventId().equals(response.data().eventId())) throw new IllegalStateException("事件桥未确认头程跨区事件");
                 repository.published(row.getId(),workerId,LocalDateTime.now());
             } catch(Exception exception) {
                 String error=safeError(exception);
                 repository.retry(row.getId(),workerId,LocalDateTime.now().plusSeconds(Math.max(retrySeconds,1)),error);
-                log.warn("装柜完成事件投递失败: eventKey={}, reason={}",row.getEventKey(),error);
+                log.warn("头程跨区事件投递失败: eventType={}, eventKey={}, reason={}",
+                    row.getEventType(), row.getEventKey(), error);
             }
         }
     }