优化

firstleg/src/main/resources/application.yml

@@ -33,6 +33,14 @@ baiyue:
       cosco-official-api-enabled: ${COSCO_OPEN_API_ENABLED:false}
       emc-automated: ${EMC_TRACKING_ENABLED:false}
       hede-automated: ${HEDE_TRACKING_ENABLED:false}
+    scheduler:
+      zone: ${CARRIER_SCHEDULE_ZONE:Asia/Shanghai}
+      cron-morning: ${CARRIER_SCHEDULE_CRON_MORNING:0 0 9 * * *}
+      cron-noon: ${CARRIER_SCHEDULE_CRON_NOON:0 30 12 * * *}
+      cron-afternoon: ${CARRIER_SCHEDULE_CRON_AFTERNOON:0 0 16 * * *}
+      batch-size: ${CARRIER_SCHEDULE_BATCH_SIZE:20}
+      max-tasks-per-trigger: ${CARRIER_SCHEDULE_MAX_TASKS_PER_TRIGGER:2000}
+      lease-duration: ${CARRIER_SCHEDULE_LEASE_DURATION:PT5M}
   security:
     jwt-secret: ${JWT_SECRET:change-me-to-at-least-32-bytes-long-before-start}
     internal-service-token: ${INTERNAL_SERVICE_TOKEN:change-me-to-an-internal-token-at-least-32-bytes-long}

firstleg/src/main/resources/db/phase3-carrier-schedule-query-schema.sql

@@ -21,10 +21,10 @@ CREATE TABLE IF NOT EXISTS fl_carrier_schedule_query (
   stop_reason VARCHAR(500) NULL COMMENT '任务停止原因',
   lease_owner VARCHAR(64) NULL COMMENT '当前调度租约持有者',
   lease_until DATETIME(3) NULL COMMENT '当前调度租约过期时间',
-  consecutive_failures INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '连续失败次数，用于指数退避',
-  window_started_at DATETIME(3) NOT NULL COMMENT '当前三天查询窗口起始时间',
-  attempt_count INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '当前查询窗口已执行次数；最多3次',
-  next_allowed_at DATETIME(3) NULL COMMENT '频控规则允许的下次查询时间；停止后为空',
+  consecutive_failures INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '连续失败次数诊断值；不改变固定查询槽位',
+  window_started_at DATETIME(3) NOT NULL COMMENT '首次进入自动查询调度的时间',
+  attempt_count INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '累计自动查询调用次数',
+  next_allowed_at DATETIME(3) NULL COMMENT '下一个09:00、12:30或16:00固定查询槽位；停止后为空',
   last_attempt_at DATETIME(3) NULL COMMENT '最近一次查询尝试时间',
   last_success_at DATETIME(3) NULL COMMENT '最近一次取得有效结果时间',
   source_updated_at DATETIME(3) NULL COMMENT '船公司官网展示的结果更新时间',
@@ -64,14 +64,13 @@ CREATE TABLE IF NOT EXISTS fl_carrier_schedule_query (
   CONSTRAINT chk_carrier_schedule_query_node CHECK
     (latest_standard_node IS NULL OR latest_standard_node IN
       ('DEPARTED_WAREHOUSE','AT_ORIGIN_PORT','LOADED_ON_VESSEL','DEPARTED_ORIGIN_PORT','IN_TRANSIT',
-       'ARRIVED_DESTINATION_PORT','DISCHARGED_FROM_VESSEL','PICKUP_READY','PICKED_UP','EMPTY_RETURNED')),
-  CONSTRAINT chk_carrier_schedule_query_attempt CHECK (attempt_count BETWEEN 0 AND 3)
-) ENGINE=InnoDB COMMENT='六家船公司官网查询任务与三天窗口频控';
+       'ARRIVED_DESTINATION_PORT','DISCHARGED_FROM_VESSEL','PICKUP_READY','PICKED_UP','EMPTY_RETURNED'))
+) ENGINE=InnoDB COMMENT='六家船公司固定时刻自动查询任务';
 
 CREATE TABLE IF NOT EXISTS fl_carrier_schedule_query_attempt (
   id BIGINT UNSIGNED NOT NULL COMMENT '船司官网查询尝试ID',
   query_id BIGINT UNSIGNED NOT NULL COMMENT '所属船司官网查询任务ID',
-  window_attempt_no INT UNSIGNED NOT NULL COMMENT '当前三天窗口内的尝试序号；取值1至3',
+  window_attempt_no INT UNSIGNED NOT NULL COMMENT '任务累计自动查询调用序号',
   carrier_code VARCHAR(16) NOT NULL COMMENT '本次尝试的船公司编码快照',
   access_mode VARCHAR(32) NOT NULL COMMENT '本次尝试的官网访问方式快照',
   official_url VARCHAR(500) NOT NULL COMMENT '本次尝试使用的官网地址快照',
@@ -87,7 +86,6 @@ CREATE TABLE IF NOT EXISTS fl_carrier_schedule_query_attempt (
   PRIMARY KEY (id),
   KEY idx_carrier_schedule_attempt_query (query_id,created_at,id),
   CONSTRAINT fk_carrier_schedule_attempt_query FOREIGN KEY (query_id) REFERENCES fl_carrier_schedule_query(id),
-  CONSTRAINT chk_carrier_schedule_attempt_no CHECK (window_attempt_no BETWEEN 1 AND 3),
   CONSTRAINT chk_carrier_schedule_attempt_status CHECK
     (attempt_status IN ('SUCCESS','NO_CHANGE','RETRYABLE_FAILURE','PERMANENT_FAILURE','MANUAL_REQUIRED'))
 ) ENGINE=InnoDB COMMENT='船司官网查询尝试不可变审计';

firstleg/src/main/resources/openapi/carrier-schedule-query-v1.yaml

@@ -25,7 +25,7 @@ paths:
         - {name: page, in: query, schema: {type: integer, minimum: 1, default: 1}}
         - {name: size, in: query, schema: {type: integer, minimum: 1, maximum: 200, default: 20}}
       responses:
-        '200': {description: Query tasks with source, freshness and rate-limit fields}
+        '200': {description: Query tasks with source and freshness fields; automatic execution uses the fixed Shanghai slots}
     post:
       summary: Create a query task linked to a real booking and allocated container
       x-permission: platform:firstleg:port-schedule-query:create