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-09-01 10:00:13 +08:00
parent 249b182e7f
commit 477971dda1
11 changed files with 145 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firstleg/src/test/java/com/baiyue/firstleg/loading/repository/LoadingEvidenceSqlContractTest.java
+2
View File
@@ -20,6 +20,7 @@ class LoadingEvidenceSqlContractTest {
.contains("source_task_id BIGINT UNSIGNED NOT NULL")
.contains("UNIQUE KEY uk_cabinet_evidence_active (container_booking_id,evidence_type,active_flag)")
.contains("UNIQUE KEY uk_cabinet_evidence_operation (source_task_id,operation_key)")
.contains("DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci")
.contains("FOREIGN KEY (container_booking_id) REFERENCES fl_container_booking(id)")
.doesNotContain("CREATE TABLE IF NOT EXISTS fl_loading_evidence");
}
@@ -32,6 +33,7 @@ class LoadingEvidenceSqlContractTest {
assertThat(sql).contains("CREATE TABLE IF NOT EXISTS fl_loading_cabinet_evidence")
.contains("uk_cabinet_evidence_active")
.contains("uk_cabinet_evidence_operation")
.contains("normalize_loading_cabinet_evidence_collation")
.doesNotContain("CREATE TABLE IF NOT EXISTS fl_loading_evidence")
.doesNotContain("phase3_loading_evidence_add_column");
}
firstleg/src/test/java/com/baiyue/firstleg/outbound/dispatch/OutboundDispatchReadMapperContractTest.java
+17 -2
View File
@@ -87,11 +87,12 @@ class OutboundDispatchReadMapperContractTest {
.getAnnotation(Select.class).value());
assertThat(sql)
.contains("SELECT 'CUSTOMS'", "FROM fl_customs_container_history h JOIN fl_customs_container customs_container")
.contains("CONVERT('CUSTOMS' USING utf8mb4)",
"FROM fl_customs_container_history h JOIN fl_customs_container customs_container")
.contains("customs_container.container_booking_id=#{containerBookingId}")
.doesNotContain("fl_customs_history", "customs_case.tenant_id=#{tenantId}",
"customs_case.order_id=#{orderId}", "customs_case.inbound_id=#{inboundId}")
.contains("SELECT 'SAILING_SCHEDULE'",
.contains("CONVERT('SAILING_SCHEDULE' USING utf8mb4)",
"FROM fl_port_schedule_history h JOIN fl_port_schedule port_schedule")
.contains("port_schedule.customer_id=#{tenantId}",
"port_schedule.ocean_booking_id=#{oceanBookingId}")
@@ -100,4 +101,18 @@ class OutboundDispatchReadMapperContractTest {
.contains("schedule_inbound.id=#{inboundId}")
.contains("ORDER BY occurredAt,module");
}
@Test
void timelineNormalizesTextCollationAcrossEveryUnionBranch() throws Exception {
String sql = String.join("\n", OutboundDispatchReadMapper.class
.getMethod("timeline", long.class, long.class, long.class, long.class,
long.class, Long.class, Long.class)
.getAnnotation(Select.class).value());
assertThat(sql)
.contains("CONVERT('INBOUND' USING utf8mb4) COLLATE utf8mb4_0900_ai_ci")
.contains("CONVERT('LOADING_EVIDENCE' USING utf8mb4) COLLATE utf8mb4_0900_ai_ci")
.contains("CONVERT(COALESCE(e.updated_by_name,e.created_by_name) USING utf8mb4) COLLATE utf8mb4_0900_ai_ci")
.contains("CONVERT('OUTBOUND_DISPATCH' USING utf8mb4) COLLATE utf8mb4_0900_ai_ci");
}
}
firstleg/src/test/java/com/baiyue/firstleg/repository/Phase3FinalUnifiedSqlContractTest.java
+3 -1
View File
@@ -48,6 +48,8 @@ class Phase3FinalUnifiedSqlContractTest {
.contains("CREATE TABLE IF NOT EXISTS fl_loading_cabinet_evidence")
.contains("UNIQUE KEY uk_cabinet_evidence_active (container_booking_id,evidence_type,active_flag)")
.contains("UNIQUE KEY uk_cabinet_evidence_operation (source_task_id,operation_key)")
.contains("normalize_loading_cabinet_evidence_collation")
.contains("table_collation<>'utf8mb4_0900_ai_ci'")
.contains("column_name IN ('container_booking_id','source_task_id','active_flag','operation_key','request_hash')")
.doesNotContain("CREATE TABLE IF NOT EXISTS fl_loading_evidence", "phase3_loading_evidence_add_column")
.contains("CALL assert_phase3_final_schema()")
@@ -153,7 +155,7 @@ class Phase3FinalUnifiedSqlContractTest {
.contains("存在缺失中文注释的业务字段")
.doesNotContain("CREATE PROCEDURE upgrade_column_comment");
assertThat(count(sql, "CALL queue_table_comment(")).isEqualTo(144);
assertThat(count(sql, "CALL queue_column_comment(")).isGreaterThanOrEqualTo(2380);
assertThat(count(sql, "CALL queue_column_comment(")).isGreaterThanOrEqualTo(2379);
assertThat(sql)
.contains("CALL queue_column_comment('baiyue_firstleg', 'fl_inbound_fee_detail', 'supplier_id'")
.contains("CALL queue_column_comment('baiyue_firstleg', 'fl_inbound_fee_detail', 'supplier_name'")