From cc720a16549bbb691344afb31f702530588c75fd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 三月 2026 00:03:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java | 80 +++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 42 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 87d62e9..b5a45d8 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);
}
}
@@ -240,29 +244,15 @@
return commandResponse;
}
- if (isDuplicateStationCommand(statusEntity, command)) {
- log.info("杈撻�佺嚎鍛戒护閲嶅锛屽凡璺宠繃褰撳墠绔欑偣鍛戒护銆備换鍔″彿={}锛岀珯鐐瑰彿={}锛岀洰鏍囩珯={}",
- command.getTaskNo(), command.getStationId(), command.getTargetStaNo());
- commandResponse.setResult(true);
- commandResponse.setMessage("鍛戒护閲嶅锛屽凡璺宠繃涓嬪彂");
- return commandResponse;
- }
-
- if (existsDuplicateTaskAreaCommand(stationIdx, command)) {
- log.info("杈撻�佺嚎鍛戒护閲嶅锛屽凡璺宠繃浠诲姟鍐欏叆鍖洪噸澶嶅懡浠ゃ�備换鍔″彿={}锛岀珯鐐瑰彿={}锛岀洰鏍囩珯={}",
- command.getTaskNo(), command.getStationId(), command.getTargetStaNo());
- commandResponse.setResult(true);
- commandResponse.setMessage("浠诲姟鍖哄凡鏈夌浉鍚屽懡浠わ紝宸茶烦杩囦笅鍙�");
- return commandResponse;
- }
-
int useTaskWriteIdx = getTaskWriteIdx(stationIdx, taskWriteIdx);
if (useTaskWriteIdx == -1) {
commandResponse.setMessage("鍛戒护涓嬪彂瓒呮椂锛屾棤娉曟壘鍒板彲鐢ㄤ笅鍙戝尯鍩�");
return commandResponse;
}
- OperateResult writeTaskNo = siemensNet.Write("DB13." + (stationIdx * TASK_AREA_LENGTH + (useTaskWriteIdx * TASK_AREA_SLOT_SIZE)), command.getTaskNo());
+ int taskBaseOffset = stationIdx * TASK_AREA_LENGTH + (useTaskWriteIdx * TASK_AREA_SLOT_SIZE);
+
+ OperateResult writeTaskNo = siemensNet.Write("DB13." + taskBaseOffset, command.getTaskNo());
if (!writeTaskNo.IsSuccess) {
log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傜珯鐐圭紪鍙�={}锛岀珯鐐规暟鎹�={}", command.getTaskNo(), JSON.toJSON(command));
commandResponse.setResult(false);
@@ -270,11 +260,11 @@
return commandResponse;
}
- OperateResult writeData = siemensNet.Write("DB13." + (stationIdx * TASK_AREA_LENGTH + (useTaskWriteIdx * TASK_AREA_SLOT_SIZE + 4)), command.getTargetStaNo().shortValue());
- if (!writeData.IsSuccess) {
+ OperateResult writeTarget = siemensNet.Write("DB13." + (taskBaseOffset + 6), command.getTargetStaNo().shortValue());
+ if (!writeTarget.IsSuccess) {
log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傜珯鐐圭紪鍙�={}锛岀珯鐐规暟鎹�={}", command.getTaskNo(), JSON.toJSON(command));
commandResponse.setResult(false);
- commandResponse.setMessage("鍛戒护涓嬪彂澶辫触锛屽啓鍏ユ暟鎹尯鍩熷け璐�");
+ commandResponse.setMessage("鍛戒护涓嬪彂澶辫触锛屽啓鍏ョ洰鏍囪澶囧彿澶辫触");
return commandResponse;
}
@@ -336,42 +326,48 @@
OperateResultExOne<byte[]> resultTask = siemensNet.Read("DB13." + (stationIdx * TASK_AREA_LENGTH), (short) TASK_AREA_LENGTH);
if (resultTask.IsSuccess) {
int taskNo = siemensNet.getByteTransform().TransInt32(resultTask.Content, taskWriteIdx * TASK_AREA_SLOT_SIZE);
- int startPoint = siemensNet.getByteTransform().TransInt16(resultTask.Content, taskWriteIdx * TASK_AREA_SLOT_SIZE + 4);
int targetPoint = siemensNet.getByteTransform().TransInt16(resultTask.Content, taskWriteIdx * TASK_AREA_SLOT_SIZE + 6);
- if (taskNo == 0 && startPoint == 0 && targetPoint == 0) {
+ if (taskNo == 0 && targetPoint == 0) {
useIdx = taskWriteIdx;
}
}
return useIdx;
}
- private boolean isDuplicateStationCommand(ZyStationStatusEntity statusEntity, StationCommand command) {
- if (statusEntity == null || command == null) {
- return false;
+ private byte[] readTaskBufferRaw() {
+ int totalLength = statusList == null ? 0 : statusList.size() * TASK_AREA_LENGTH;
+ if (totalLength <= 0) {
+ return null;
}
- return command.getTaskNo() != null
- && command.getTargetStaNo() != null
- && command.getTaskNo().equals(statusEntity.getTaskNo())
- && command.getTargetStaNo().equals(statusEntity.getTargetStaNo());
+ 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 boolean existsDuplicateTaskAreaCommand(int stationIdx, StationCommand command) {
- if (stationIdx < 0 || command == null || command.getTaskNo() == null || command.getTargetStaNo() == null) {
- return false;
+ private void fillTaskBufferStatus(byte[] taskBufferRaw, int stationIdx, ZyStationStatusEntity statusEntity) {
+ if (statusEntity == null || stationIdx < 0 || taskBufferRaw == null) {
+ statusEntity.setTaskBufferItems(new ArrayList<>());
+ return;
}
- OperateResultExOne<byte[]> resultTask = siemensNet.Read("DB13." + (stationIdx * TASK_AREA_LENGTH), (short) TASK_AREA_LENGTH);
- if (!resultTask.IsSuccess || resultTask.Content == null) {
- return false;
+ 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 = slotIdx * TASK_AREA_SLOT_SIZE;
- int taskNo = siemensNet.getByteTransform().TransInt32(resultTask.Content, offset);
- int targetPoint = siemensNet.getByteTransform().TransInt16(resultTask.Content, offset + 6);
- if (command.getTaskNo().equals(taskNo) && command.getTargetStaNo().equals(targetPoint)) {
- return true;
- }
+ 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);
}
- return false;
+ statusEntity.setTaskBufferItems(itemList);
}
private int findIndex(Integer stationId) {
--
Gitblit v1.9.1