feat(javaTest): load source task and aisle front fields

This commit is contained in:
zgw
2026-08-07 13:34:54 +08:00
parent 9ca43a3911
commit 1fd45f4f69
9 changed files with 205 additions and 2 deletions

View File

@@ -0,0 +1,22 @@
package com.ft546.wcs.shadow.history;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* 保存从生产 bas_cargo_space 只读查询导出的货位分组和通道前端事实。
*
* <p>仿真只读取该离线快照,不在运行时访问生产数据库,也不通过站点编号或坐标猜测前端。
*/
public final class HistoricalChannelFrontRecord {
@JsonProperty("site_id") private String siteId;
@JsonProperty("group_coding_no") private String groupCodingNo;
@JsonProperty("group_coding") private String groupCoding;
@JsonProperty("front_site_id") private String frontSiteId;
public HistoricalChannelFrontRecord() { }
public String getSiteId() { return siteId; }
public String getGroupCodingNo() { return groupCodingNo; }
public String getGroupCoding() { return groupCoding; }
public String getFrontSiteId() { return frontSiteId; }
}

View File

@@ -26,6 +26,7 @@ public final class HistoricalQueueDataset {
private final int missingPathRows;
private final int missingIntervalRows;
private final int reversedIntervalRows;
private final List<HistoricalChannelFrontRecord> channelFrontRecords;
/**
* 创建 {@code HistoricalQueueDataset} 实例并初始化其内部状态。
@@ -59,6 +60,27 @@ public final class HistoricalQueueDataset {
String minFinishDate, String maxFinishDate,
int missingPathRows, int missingIntervalRows,
int reversedIntervalRows) {
this(records, mapSiteDetails, fullMapCells, fullMapRows, fullMapSha256,
manifestSampleRows, fullScanTotalRows, database, sourceTable, extractedAt,
minCreateDate, maxCreateDate, minFinishDate, maxFinishDate,
missingPathRows, missingIntervalRows, reversedIntervalRows,
Collections.<HistoricalChannelFrontRecord>emptyList());
}
/**
* 创建带生产通道前端快照的数据集,使业务归并和地图数据来自同一份可审计离线输入。
*/
public HistoricalQueueDataset(List<HistoricalQueueRecord> records,
Map<String, HistoricalMapSite> mapSiteDetails,
List<HistoricalMapCell> fullMapCells,
int fullMapRows, String fullMapSha256,
int manifestSampleRows, int fullScanTotalRows,
String database, String sourceTable, String extractedAt,
String minCreateDate, String maxCreateDate,
String minFinishDate, String maxFinishDate,
int missingPathRows, int missingIntervalRows,
int reversedIntervalRows,
List<HistoricalChannelFrontRecord> channelFrontRecords) {
this.records = Collections.unmodifiableList(new ArrayList<HistoricalQueueRecord>(records));
this.mapSiteDetails = Collections.unmodifiableMap(
new LinkedHashMap<String, HistoricalMapSite>(mapSiteDetails));
@@ -78,6 +100,8 @@ public final class HistoricalQueueDataset {
this.missingPathRows = missingPathRows;
this.missingIntervalRows = missingIntervalRows;
this.reversedIntervalRows = reversedIntervalRows;
this.channelFrontRecords = Collections.unmodifiableList(
new ArrayList<HistoricalChannelFrontRecord>(channelFrontRecords));
}
/**
@@ -209,4 +233,9 @@ public final class HistoricalQueueDataset {
* @return 本次处理产生的结果;调用方据此继续后续流程。
*/
public int getReversedIntervalRows() { return reversedIntervalRows; }
/** 返回由生产货位分组查询固化的通道前端事实。 */
public List<HistoricalChannelFrontRecord> getChannelFrontRecords() {
return channelFrontRecords;
}
}

View File

@@ -40,17 +40,27 @@ public final class HistoricalQueueLoader {
byte[] mapBytes = read(loader, basePath + "/map-sites.json");
byte[] summaryBytes = read(loader, basePath + "/full-scan-summary.json");
byte[] fullMapBytes = read(loader, basePath + "/full-map-grid.json");
byte[] channelFrontBytes = read(loader, basePath + "/channel-fronts.json");
verifySha256(manifest.path("sha256").path("queue-history-200.json").asText(), queueBytes);
verifySha256(manifest.path("sha256").path("map-sites.json").asText(), mapBytes);
verifySha256(manifest.path("sha256").path("full-scan-summary.json").asText(), summaryBytes);
String fullMapSha256 = manifest.path("sha256").path("full-map-grid.json").asText();
verifySha256(fullMapSha256, fullMapBytes);
verifySha256(manifest.path("sha256").path("channel-fronts.json").asText(),
channelFrontBytes);
CollectionType rowsType = MAPPER.getTypeFactory()
.constructCollectionType(List.class, HistoricalQueueRecord.class);
List<HistoricalQueueRecord> rows = MAPPER.readValue(queueBytes, rowsType);
CollectionType cellsType = MAPPER.getTypeFactory()
.constructCollectionType(List.class, HistoricalMapCell.class);
List<HistoricalMapCell> fullMapCells = MAPPER.readValue(fullMapBytes, cellsType);
CollectionType channelFrontType = MAPPER.getTypeFactory()
.constructCollectionType(List.class, HistoricalChannelFrontRecord.class);
List<HistoricalChannelFrontRecord> channelFrontRecords =
MAPPER.readValue(channelFrontBytes, channelFrontType);
if (manifest.path("channelFrontRows").asInt() != channelFrontRecords.size()) {
throw new IllegalArgumentException("channel front row count mismatch");
}
int fullMapRows = manifest.path("fullMapRows").asInt();
if (fullMapRows != fullMapCells.size()) {
throw new IllegalArgumentException("full map row count mismatch");
@@ -92,7 +102,8 @@ public final class HistoricalQueueLoader {
scanSummary.path("max_finish_date").asText(),
scanSummary.path("missing_path_rows").asInt(),
scanSummary.path("missing_interval_rows").asInt(),
scanSummary.path("reversed_interval_rows").asInt());
scanSummary.path("reversed_interval_rows").asInt(),
channelFrontRecords);
} catch (IOException ex) {
throw new IllegalArgumentException("cannot load history snapshot", ex);
}

View File

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
@JsonIgnoreProperties(ignoreUnknown = true)
public final class HistoricalQueueRecord {
@JsonProperty("snapshot_row") private String snapshotRow;
@JsonProperty("guid") private String guid;
@JsonProperty("task_no") private String taskNo;
@JsonProperty("task_type") private String taskType;
@@ -12,6 +13,8 @@ public final class HistoricalQueueRecord {
@JsonProperty("cargo") private String cargo;
@JsonProperty("issued") private String issued;
@JsonProperty("execution_status") private String executionStatus;
@JsonProperty("cargo_pick_site") private String cargoPickSite;
@JsonProperty("cargo_place_site") private String cargoPlaceSite;
@JsonProperty("start_site") private String startSite;
@JsonProperty("end_site") private String endSite;
@JsonProperty("the_floor") private String floor;
@@ -20,6 +23,9 @@ public final class HistoricalQueueRecord {
@JsonProperty("start_date") private String startDate;
@JsonProperty("finish_date") private String finishDate;
@JsonProperty("agv_id") private String agvId;
@JsonProperty("default02") private String default02;
@JsonProperty("default06") private String default06;
@JsonProperty("default08") private String default08;
/**
* 创建 {@code HistoricalQueueRecord} 实例并初始化其内部状态。
@@ -58,6 +64,9 @@ public final class HistoricalQueueRecord {
this.agvId = agvId;
}
/** 返回本行在数据库扫描快照中的稳定行号,用于识别重复扫描而不是重新创建业务任务。 */
public String getSnapshotRow() { return snapshotRow; }
/**
* 返回当前对象保存的“guid”信息。
*
@@ -107,6 +116,10 @@ public final class HistoricalQueueRecord {
* @return 本次处理产生的结果;调用方据此继续后续流程。
*/
public String getExecutionStatus() { return executionStatus; }
/** 返回生产队列保存的业务取货点;二段任务以该点而不是队列当前 start_site 为业务源点。 */
public String getCargoPickSite() { return cargoPickSite; }
/** 返回生产队列保存的业务放货点;二段任务以该点而不是阶段 end_site 为业务目标。 */
public String getCargoPlaceSite() { return cargoPlaceSite; }
/**
* 返回当前对象保存的“start site”信息。
*
@@ -163,4 +176,10 @@ public final class HistoricalQueueRecord {
* @return 本次处理产生的结果;调用方据此继续后续流程。
*/
public String getAgvId() { return agvId; }
/** 返回生产队列的业务/设备阶段编码,其中 1、2、7 分别代表入库、出库和移库。 */
public String getDefault02() { return default02; }
/** 返回生产多段任务保存的通道前端站点。 */
public String getDefault06() { return default06; }
/** 返回生产多段任务的首次/后续下发标记。 */
public String getDefault08() { return default08; }
}

View File

@@ -0,0 +1,56 @@
package com.ft546.wcs.shadow.history.simulation;
import com.ft546.wcs.shadow.history.HistoricalChannelFrontRecord;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
/** 根据生产货位分组快照提供权威的通道前端查询,不向普通地图增加虚构边。 */
public final class ChannelFrontTopology {
private final Map<String, String> frontBySite;
private ChannelFrontTopology(Map<String, String> frontBySite) {
this.frontBySite = Collections.unmodifiableMap(
new LinkedHashMap<String, String>(frontBySite));
}
/**
* 将 SQL 快照转换为站点到前端的唯一映射;同一站点出现冲突时拒绝启动仿真。
*/
public static ChannelFrontTopology from(List<HistoricalChannelFrontRecord> records) {
if (records == null) throw new IllegalArgumentException("channel front records are required");
Map<String, String> values = new LinkedHashMap<String, String>();
for (HistoricalChannelFrontRecord record : records) {
String site = required(record.getSiteId(), "site id");
String front = required(record.getFrontSiteId(), "front site id");
String previous = values.put(site, front);
if (previous != null && !previous.equals(front)) {
throw new IllegalArgumentException("conflicting channel front for " + site);
}
}
return new ChannelFrontTopology(values);
}
/** 返回货位所属通道的权威前端;非货位输送点返回空。 */
public Optional<String> frontFor(String siteId) {
return Optional.ofNullable(frontBySite.get(siteId));
}
/** 判断业务货位与通道前端是否不同,从而是否需要生成显式前端移动阶段。 */
public boolean requiresFrontMovement(String siteId) {
Optional<String> front = frontFor(siteId);
return front.isPresent() && !front.get().equals(siteId);
}
public Map<String, String> asMap() { return frontBySite; }
private static String required(String value, String name) {
if (value == null || value.trim().isEmpty()) {
throw new IllegalArgumentException(name + " is required");
}
return value.trim();
}
}

View File

@@ -59,6 +59,22 @@ class HistoricalQueueLoaderTest {
assertEquals(5193, data.getMissingPathRows());
}
/**
* 防止生产队列阶段字段在 JSON 反序列化时被静默丢弃;业务任务归并必须使用这些原始事实。
*/
@Test
void loadsSourceQueueStageFieldsAndChannelFrontSnapshot() {
HistoricalQueueDataset data = new HistoricalQueueLoader().load(
getClass().getClassLoader(), "shadow/history");
assertEquals("1393", data.getRecords().get(0).getSnapshotRow());
assertEquals("050101", data.getRecords().get(0).getCargoPickSite());
assertEquals("030401", data.getRecords().get(0).getCargoPlaceSite());
assertEquals("8", data.getRecords().get(0).getDefault02());
assertEquals("", data.getRecords().get(0).getDefault08());
assertEquals(17, data.getChannelFrontRecords().size());
}
/**
* 验证“rejects hash mismatch”场景,确保相关业务规则和断言成立。
*

View File

@@ -0,0 +1,29 @@
package com.ft546.wcs.shadow.history.simulation;
import com.ft546.wcs.shadow.history.HistoricalQueueDataset;
import com.ft546.wcs.shadow.history.HistoricalQueueLoader;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
class ChannelFrontTopologyTest {
/**
* 防止把站点编号或坐标误当成通道前端;结果必须来自固化的 bas_cargo_space 分组快照。
*/
@Test
void resolvesTheSameFrontAsTheProductionGroupCodingQuery() {
HistoricalQueueDataset data = new HistoricalQueueLoader().load(
getClass().getClassLoader(), "shadow/history");
ChannelFrontTopology topology = ChannelFrontTopology.from(
data.getChannelFrontRecords());
assertEquals("050301", topology.frontFor("030301").get());
assertEquals("050401", topology.frontFor("040401").get());
assertEquals("050701", topology.frontFor("010701").get());
assertTrue(topology.requiresFrontMovement("030301"));
assertFalse(topology.requiresFrontMovement("050203"));
assertFalse(topology.frontFor("070101").isPresent());
}
}

View File

@@ -0,0 +1,19 @@
[
{"site_id":"010701","group_coding_no":"A0701","group_coding":"1","front_site_id":"050701"},
{"site_id":"030301","group_coding_no":"A0301","group_coding":"1","front_site_id":"050301"},
{"site_id":"030401","group_coding_no":"A0401","group_coding":"1","front_site_id":"050401"},
{"site_id":"030501","group_coding_no":"A0501","group_coding":"1","front_site_id":"050501"},
{"site_id":"030601","group_coding_no":"A0601","group_coding":"1","front_site_id":"050601"},
{"site_id":"040301","group_coding_no":"A0301","group_coding":"2","front_site_id":"050301"},
{"site_id":"040401","group_coding_no":"A0401","group_coding":"2","front_site_id":"050401"},
{"site_id":"050203","group_coding_no":"A0203","group_coding":"5","front_site_id":"050203"},
{"site_id":"081301","group_coding_no":"C1301","group_coding":"1","front_site_id":"071301"},
{"site_id":"090901","group_coding_no":"D0901","group_coding":"1","front_site_id":"090901"},
{"site_id":"091101","group_coding_no":"D1101","group_coding":"1","front_site_id":"091101"},
{"site_id":"110301","group_coding_no":"B0301","group_coding":"1","front_site_id":"110301"},
{"site_id":"110302","group_coding_no":"B0302","group_coding":"1","front_site_id":"110302"},
{"site_id":"110402","group_coding_no":"B0402","group_coding":"1","front_site_id":"110402"},
{"site_id":"110501","group_coding_no":"B0501","group_coding":"1","front_site_id":"110501"},
{"site_id":"110601","group_coding_no":"B0601","group_coding":"1","front_site_id":"110601"},
{"site_id":"110801","group_coding_no":"B0801","group_coding":"1","front_site_id":"110801"}
]

View File

@@ -6,11 +6,13 @@
"sampleRows": 240,
"mapRows": 1129,
"fullMapRows": 2552,
"channelFrontRows": 17,
"queryId": "wcs-real-queue-history-replay-v1",
"sha256": {
"queue-history-200.json": "8f06d18354c8c199906e75d4243f6d993853d48d1d956fafee36e9f828ab5a94",
"map-sites.json": "8a16f0c797f6f5e952cd07ce5a50af3a5069c6c102604c20a4e816d2aa88d08d",
"full-scan-summary.json": "9186836b0c162ea302085fab6ccaf87ffa1733a869f42d2b8bf489a910e36d63",
"full-map-grid.json": "f99ce691fa1935fa2aaf4db595143f7757e9baf7b4852f2bace24248c70da7f5"
"full-map-grid.json": "f99ce691fa1935fa2aaf4db595143f7757e9baf7b4852f2bace24248c70da7f5",
"channel-fronts.json": "a4c6a86d815caedc05eda644d62b857e666516a175d3a5dcde851f7eb5178e77"
}
}