From ecb51654e5224950f1fe8d139190d1c1a8daebca Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 23 三月 2026 22:46:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java | 150 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 119 insertions(+), 31 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 556fa8c..2819723 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
@@ -6,7 +6,7 @@
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
@@ -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;
@@ -33,6 +35,10 @@
*/
@Slf4j
public class ZyStationV4RealConnect implements ZyStationConnectApi {
+
+ private static final int TASK_AREA_LENGTH = 48;
+ private static final int TASK_AREA_SLOT_SIZE = 12;
+ private static final int TASK_AREA_SLOT_COUNT = 3;
private List<ZyStationStatusEntity> statusList;
private List<StationObjModel> barcodeOriginList;
@@ -83,7 +89,7 @@
}
BasDevp basDevp = basDevpService
- .selectOne(new EntityWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
+ .getOne(new QueryWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
if (basDevp == null) {
return Collections.emptyList();
}
@@ -116,6 +122,7 @@
boolean[] status2 = siemensNet.getByteTransform().TransBool(result.Content, i * 10 + 7, 1);
statusEntity.setEnableIn(status2[1]);//鍚姩鍏ュ簱
+ statusEntity.setRunBlock(status2[2]);//閲嶆柊瑙勫垝璺嚎
Integer palletHeight = null;
if (status[7]) {
@@ -132,6 +139,7 @@
statusEntity.setError(0);//榛樿鏃犳姤璀�
statusEntity.setTaskWriteIdx((int) siemensNet.getByteTransform().TransInt16(result.Content, i * 10 + 8));//浠诲姟鍙啓鍖�
+ fillTaskBufferStatus(i, statusEntity);
}
}
@@ -220,19 +228,56 @@
return commandResponse;
}
- int taskWriteIdx = getTaskWriteIdx(command.getStationId());
- if (taskWriteIdx == -1) {
+ getStatus(deviceNo);
+
+ int stationIdx = findIndex(command.getStationId());
+ if (stationIdx == -1) {
+ commandResponse.setMessage("鍛戒护涓嬪彂澶辫触锛屾湭鎵惧埌绔欑偣鐘舵��");
+ return commandResponse;
+ }
+
+ ZyStationStatusEntity statusEntity = statusList.get(stationIdx);
+ Integer taskWriteIdx = statusEntity == null ? null : statusEntity.getTaskWriteIdx();
+ if (taskWriteIdx == null || taskWriteIdx <= 0) {
+ commandResponse.setMessage("鍛戒护涓嬪彂澶辫触锛屽綋鍓嶆棤鍙敤浠诲姟鍐欏叆鍖�");
+ return commandResponse;
+ }
+
+ if (isDuplicateStationCommand(statusEntity, command)) {
+ log.info("杈撻�佺嚎鍛戒护閲嶅锛屽凡璺宠繃褰撳墠绔欑偣鍛戒护銆備换鍔″彿={}锛岀珯鐐瑰彿={}锛岀洰鏍囩珯={}锛宼askWriteIdx={}锛宑urrentTaskNo={}锛宑urrentTargetStaNo={}",
+ command.getTaskNo(),
+ command.getStationId(),
+ command.getTargetStaNo(),
+ taskWriteIdx,
+ statusEntity == null ? null : statusEntity.getTaskNo(),
+ statusEntity == null ? null : statusEntity.getTargetStaNo());
+ commandResponse.setResult(true);
+ commandResponse.setMessage("鍛戒护閲嶅锛屽凡璺宠繃涓嬪彂");
+ return commandResponse;
+ }
+
+ Integer duplicateSlotIdx = findDuplicateTaskAreaSlot(stationIdx, command);
+ if (duplicateSlotIdx != null) {
+ log.info("杈撻�佺嚎鍛戒护閲嶅锛屽凡璺宠繃浠诲姟鍐欏叆鍖洪噸澶嶅懡浠ゃ�備换鍔″彿={}锛岀珯鐐瑰彿={}锛岀洰鏍囩珯={}锛宼askWriteIdx={}锛宒uplicateSlotIdx={}",
+ command.getTaskNo(),
+ command.getStationId(),
+ command.getTargetStaNo(),
+ taskWriteIdx,
+ duplicateSlotIdx);
+ commandResponse.setResult(true);
+ commandResponse.setMessage("浠诲姟鍖哄凡鏈夌浉鍚屽懡浠わ紝宸茶烦杩囦笅鍙�");
+ return commandResponse;
+ }
+
+ int useTaskWriteIdx = getTaskWriteIdx(stationIdx, taskWriteIdx);
+ if (useTaskWriteIdx == -1) {
commandResponse.setMessage("鍛戒护涓嬪彂瓒呮椂锛屾棤娉曟壘鍒板彲鐢ㄤ笅鍙戝尯鍩�");
return commandResponse;
}
- int stationIdx = findIndex(command.getStationId());
+ int taskBaseOffset = stationIdx * TASK_AREA_LENGTH + (useTaskWriteIdx * TASK_AREA_SLOT_SIZE);
- short[] data = new short[2];
- data[0] = command.getStationId().shortValue();
- data[1] = command.getTargetStaNo().shortValue();
-
- OperateResult writeTaskNo = siemensNet.Write("DB13." + (stationIdx * 48 + (taskWriteIdx * 12)), command.getTaskNo());
+ OperateResult writeTaskNo = siemensNet.Write("DB13." + taskBaseOffset, command.getTaskNo());
if (!writeTaskNo.IsSuccess) {
log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傜珯鐐圭紪鍙�={}锛岀珯鐐规暟鎹�={}", command.getTaskNo(), JSON.toJSON(command));
commandResponse.setResult(false);
@@ -240,11 +285,11 @@
return commandResponse;
}
- OperateResult writeData = siemensNet.Write("DB13." + (stationIdx * 48 + (taskWriteIdx * 12 + 4)), data);
- 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;
}
@@ -298,30 +343,73 @@
return null;
}
- private int getTaskWriteIdx(int stationId) {
+ private int getTaskWriteIdx(int stationIdx, Integer taskWriteIdx) {
int useIdx = -1;
-
- int stationIdx = findIndex(stationId);
- if (stationIdx != -1) {
- ZyStationStatusEntity statusEntity = statusList.get(stationIdx);
-
- Integer taskWriteIdx = statusEntity.getTaskWriteIdx();
- if (taskWriteIdx > 0) {
- OperateResultExOne<byte[]> resultTask = siemensNet.Read("DB13." + (stationId * 48), (short) 48);
- if (resultTask.IsSuccess) {
- int taskNo = siemensNet.getByteTransform().TransInt32(resultTask.Content, taskWriteIdx * 12);
- int startPoint = siemensNet.getByteTransform().TransInt16(resultTask.Content, taskWriteIdx * 12 + 4);
- int targetPoint = siemensNet.getByteTransform().TransInt16(resultTask.Content, taskWriteIdx * 12 + 6);
- if (taskNo == 0 && startPoint == 0 && targetPoint == 0) {
- useIdx = taskWriteIdx;
- }
- }
+ if (stationIdx < 0 || taskWriteIdx == null || taskWriteIdx <= 0) {
+ return useIdx;
+ }
+ 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 targetPoint = siemensNet.getByteTransform().TransInt16(resultTask.Content, taskWriteIdx * TASK_AREA_SLOT_SIZE + 6);
+ if (taskNo == 0 && targetPoint == 0) {
+ useIdx = taskWriteIdx;
}
}
-
return useIdx;
}
+ private boolean isDuplicateStationCommand(ZyStationStatusEntity statusEntity, StationCommand command) {
+ if (statusEntity == null || command == null) {
+ return false;
+ }
+ return command.getTaskNo() != null
+ && command.getTargetStaNo() != null
+ && command.getTaskNo().equals(statusEntity.getTaskNo())
+ && command.getTargetStaNo().equals(statusEntity.getTargetStaNo());
+ }
+
+ private Integer findDuplicateTaskAreaSlot(int stationIdx, StationCommand command) {
+ if (stationIdx < 0 || command == null || command.getTaskNo() == null || command.getTargetStaNo() == null) {
+ return null;
+ }
+ OperateResultExOne<byte[]> resultTask = siemensNet.Read("DB13." + (stationIdx * TASK_AREA_LENGTH), (short) TASK_AREA_LENGTH);
+ if (!resultTask.IsSuccess || resultTask.Content == null) {
+ return null;
+ }
+ 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 slotIdx;
+ }
+ }
+ return null;
+ }
+
+ private void fillTaskBufferStatus(int stationIdx, ZyStationStatusEntity statusEntity) {
+ if (statusEntity == null || stationIdx < 0) {
+ return;
+ }
+ List<StationTaskBufferItem> itemList = new ArrayList<>();
+ OperateResultExOne<byte[]> resultTask = siemensNet.Read("DB13." + (stationIdx * TASK_AREA_LENGTH), (short) TASK_AREA_LENGTH);
+ if (resultTask.IsSuccess && resultTask.Content != null) {
+ 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);
+ 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