#

Junjie

22 小时以前 cc720a16549bbb691344afb31f702530588c75fd

 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,32 +244,6 @@
            return commandResponse;
        }

        if (isDuplicateStationCommand(statusEntity, command)) {
            log.info("输送线命令重复，已跳过当前站点命令。任务号={}，站点号={}，目标站={}，taskWriteIdx={}，currentTaskNo={}，currentTargetStaNo={}",
                    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("输送线命令重复，已跳过任务写入区重复命令。任务号={}，站点号={}，目标站={}，taskWriteIdx={}，duplicateSlotIdx={}",
                    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("命令下发超时，无法找到可用下发区域");
@@ -356,34 +334,40 @@
        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 Integer findDuplicateTaskAreaSlot(int stationIdx, StationCommand command) {
        if (stationIdx < 0 || command == null || command.getTaskNo() == null || command.getTargetStaNo() == null) {
            return null;
    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 null;
        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 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);
        }
        return null;
        statusEntity.setTaskBufferItems(itemList);
    }

    private int findIndex(Integer stationId) {