From de13ff96cb19aa0fd2e63ea2d7188734215a2107 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 23 三月 2026 23:10:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
index 82f8963..d1f0431 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
@@ -18,11 +18,13 @@
import com.zy.core.model.CommandResponse;
import com.zy.core.model.StationObjModel;
import com.zy.core.model.command.StationCommand;
+import com.zy.core.model.protocol.StationTaskBufferItem;
import com.zy.core.network.api.ZyStationConnectApi;
import com.zy.core.network.entity.ZyStationStatusEntity;
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -105,6 +107,7 @@
OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) (statusList.size() * 10));
if (result.IsSuccess) {
+ byte[] taskBufferRaw = readTaskBufferRaw();
for (int i = 0; i < statusList.size(); i++) {
ZyStationStatusEntity statusEntity = statusList.get(i); // 绔欑偣缂栧彿
statusEntity.setTaskNo(siemensNet.getByteTransform().TransInt32(result.Content, i * 10)); // 宸ヤ綔鍙�
@@ -137,6 +140,7 @@
statusEntity.setError(0);//榛樿鏃犳姤璀�
statusEntity.setTaskWriteIdx((int) siemensNet.getByteTransform().TransInt16(result.Content, i * 10 + 8));//浠诲姟鍙啓鍖�
+ fillTaskBufferStatus(taskBufferRaw, i, statusEntity);
}
}
@@ -386,6 +390,42 @@
return null;
}
+ private byte[] readTaskBufferRaw() {
+ int totalLength = statusList == null ? 0 : statusList.size() * TASK_AREA_LENGTH;
+ if (totalLength <= 0) {
+ return null;
+ }
+ OperateResultExOne<byte[]> resultTask = siemensNet.Read("DB13.0", (short) totalLength);
+ if (!resultTask.IsSuccess || resultTask.Content == null || resultTask.Content.length < totalLength) {
+ return null;
+ }
+ return resultTask.Content;
+ }
+
+ private void fillTaskBufferStatus(byte[] taskBufferRaw, int stationIdx, ZyStationStatusEntity statusEntity) {
+ if (statusEntity == null || stationIdx < 0 || taskBufferRaw == null) {
+ statusEntity.setTaskBufferItems(new ArrayList<>());
+ return;
+ }
+ List<StationTaskBufferItem> itemList = new ArrayList<>();
+ int stationOffset = stationIdx * TASK_AREA_LENGTH;
+ if (stationOffset + TASK_AREA_LENGTH > taskBufferRaw.length) {
+ statusEntity.setTaskBufferItems(itemList);
+ return;
+ }
+ for (int slotIdx = 1; slotIdx <= TASK_AREA_SLOT_COUNT; slotIdx++) {
+ int offset = stationOffset + (slotIdx * TASK_AREA_SLOT_SIZE);
+ int taskNo = siemensNet.getByteTransform().TransInt32(taskBufferRaw, offset);
+ int targetPoint = siemensNet.getByteTransform().TransInt16(taskBufferRaw, offset + 6);
+ StationTaskBufferItem item = new StationTaskBufferItem();
+ item.setSlotIdx(slotIdx);
+ item.setTaskNo(taskNo);
+ item.setTargetStaNo(targetPoint);
+ itemList.add(item);
+ }
+ statusEntity.setTaskBufferItems(itemList);
+ }
+
private int findIndex(Integer stationId) {
for (int i = 0; i < statusList.size(); i++) {
ZyStationStatusEntity statusEntity = statusList.get(i);
--
Gitblit v1.9.1