From bfbb0cbe87bbacbaf3fdfb5fb3caa935ec91da1f Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 10 一月 2026 16:23:36 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/core/network/real/ZyStationRealConnect.java | 83 ++++++++++++++++++++++++++---------------
1 files changed, 53 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
index 0399061..3c87467 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
@@ -4,6 +4,7 @@
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
+import com.zy.common.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSON;
@@ -21,6 +22,7 @@
import com.zy.core.network.api.ZyStationConnectApi;
import com.zy.core.network.entity.ZyStationStatusEntity;
import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import java.text.MessageFormat;
@@ -34,11 +36,14 @@
private List<ZyStationStatusEntity> statusList;
private List<ZyStationStatusEntity> barcodeStatusList;
+ private List<ZyStationStatusEntity> scaleStatusList;
private SiemensS7Net siemensNet;
private DeviceConfig deviceConfig;
+ private RedisUtil redisUtil;
- public ZyStationRealConnect(DeviceConfig deviceConfig) {
+ public ZyStationRealConnect(DeviceConfig deviceConfig, RedisUtil redisUtil) {
this.deviceConfig = deviceConfig;
+ this.redisUtil = redisUtil;
}
@Override
@@ -70,7 +75,7 @@
}
@Override
- public List<ZyStationStatusEntity> getStatus() {
+ public List<ZyStationStatusEntity> getStatus(Integer deviceNo) {
if (statusList == null) {
BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
if (basDevpService == null) {
@@ -84,34 +89,31 @@
}
statusList = JSONObject.parseArray(basDevp.getStationList(), ZyStationStatusEntity.class);
+ if (statusList != null) {
+ statusList.sort(Comparator.comparing(ZyStationStatusEntity::getStationId));
+ }
barcodeStatusList = JSONObject.parseArray(basDevp.getBarcodeStationList(), ZyStationStatusEntity.class);
}
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) (statusList.size() * 2));
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) (statusList.size() * 8));
if (result.IsSuccess) {
for (int i = 0; i < statusList.size(); i++) {
ZyStationStatusEntity statusEntity = statusList.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensNet.getByteTransform().TransBool(result.Content, i * 2, 2);
+ boolean[] status = siemensNet.getByteTransform().TransBool(result.Content, i * 8 + 6, 2);
statusEntity.setAutoing(status[0]); // 鑷姩
statusEntity.setLoading(status[1]); // 鏈夌墿
statusEntity.setInEnable(status[2]); // 鍙叆
statusEntity.setOutEnable(status[3]);// 鍙嚭
statusEntity.setEmptyMk(status[4]); // 绌烘澘淇″彿
statusEntity.setFullPlt(status[5]); // 婊℃墭鐩�
- }
- }
- OperateResultExOne<byte[]> result1 = siemensNet.Read("DB100.0", (short) (statusList.size() * 4));
- if (result1.IsSuccess) {
- for (int i = 0; i < statusList.size(); i++) {
- ZyStationStatusEntity statusEntity = statusList.get(i);
- statusEntity.setTaskNo((int) siemensNet.getByteTransform().TransInt16(result1.Content, i * 4)); // 宸ヤ綔鍙�
- statusEntity.setTargetStaNo((int) siemensNet.getByteTransform().TransInt16(result1.Content, i * 4 + 2)); // 鐩爣绔�
+ statusEntity.setTaskNo(siemensNet.getByteTransform().TransInt32(result.Content, i * 8)); // 宸ヤ綔鍙�
+ statusEntity.setTargetStaNo((int) siemensNet.getByteTransform().TransInt16(result.Content, i * 8 + 4)); // 鐩爣绔�
}
}
// 鏉＄爜鎵弿鍣�
- OperateResultExOne<byte[]> result2 = siemensNet.Read("DB101.100", (short) (statusList.size() * 10));
+ OperateResultExOne<byte[]> result2 = siemensNet.Read("DB101.0", (short) (barcodeStatusList.size() * 16));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeStatusList.size(); i++) {
ZyStationStatusEntity barcodeEntity = barcodeStatusList.get(i);
@@ -119,9 +121,9 @@
if (statusEntity == null) {
continue;
}
- String barcode = siemensNet.getByteTransform().TransString(result2.Content, i * 10 + 2, 8, "UTF-8");
+ String barcode = siemensNet.getByteTransform().TransString(result2.Content, i * 16, 4, "UTF-8");
barcode = barcode.trim();
- barcodeEntity.setBarcode(barcode);
+ statusEntity.setBarcode(barcode);
}
}
@@ -129,7 +131,7 @@
}
@Override
- public CommandResponse sendCommand(StationCommand command) {
+ public CommandResponse sendCommand(Integer deviceNo, StationCommand command) {
CommandResponse commandResponse = new CommandResponse(false);
if (null == command) {
commandResponse.setMessage("鍛戒护涓虹┖");
@@ -142,16 +144,14 @@
return commandResponse;
}
- OperateResult write = null;
+ OperateResult writeTaskNo = null;
+ OperateResult writeTargetStaNo = null;
// 浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- short[] data = new short[2];
- data[0] = command.getTaskNo().shortValue();
- data[1] = command.getTargetStaNo().shortValue();
-
- write = siemensNet.Write("DB100." + index * 4, data);
- if (write.IsSuccess) {
+ writeTaskNo = siemensNet.Write("DB100." + index * 4, command.getTaskNo());
+ writeTargetStaNo = siemensNet.Write("DB100." + index * 4 + 4, command.getTargetStaNo().shortValue());
+ if (writeTaskNo.IsSuccess && writeTargetStaNo.IsSuccess) {
log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傜珯鐐圭紪鍙�={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", command.getStationId(), JSON.toJSON(command),
writeCount);
commandResponse.setResult(true);
@@ -164,12 +164,7 @@
}
} while (writeCount < 5);
- if (write == null) {
- commandResponse.setMessage("鍐欏叆鍛戒护澶辫触");
- return commandResponse;
- }
-
- if (!write.IsSuccess) {
+ if (!writeTaskNo.IsSuccess || !writeTargetStaNo.IsSuccess) {
ZyStationStatusEntity staProtocol = findStatusEntity(command.getStationId());
OutputQueue.DEVP.offer(MessageFormat.format("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傜珯鐐圭紪鍙�={1}锛岀珯鐐规暟鎹�={2}", command.getStationId(),
JSON.toJSON(staProtocol)));
@@ -181,6 +176,34 @@
JSON.toJSON(command));
}
return commandResponse;
+ }
+
+ @Override
+ public CommandResponse sendOriginCommand(String address, short[] data) {
+ CommandResponse commandResponse = new CommandResponse(false);
+ if (null == data || data.length == 0) {
+ commandResponse.setMessage("鏁版嵁涓虹┖");
+ return commandResponse;
+ }
+
+ OperateResult write = siemensNet.Write(address, data);
+ if (write.IsSuccess) {
+ log.info("鍐欏叆鍘熷鍛戒护鎴愬姛銆傚湴鍧�={}锛屾暟鎹�={}", address, JSON.toJSON(data));
+ commandResponse.setResult(true);
+ } else {
+ log.error("鍐欏叆鍘熷鍛戒护澶辫触銆傚湴鍧�={}锛屾暟鎹�={}", address, JSON.toJSON(data));
+ commandResponse.setResult(false);
+ }
+ return commandResponse;
+ }
+
+ @Override
+ public byte[] readOriginCommand(String address, int length) {
+ OperateResultExOne<byte[]> result = siemensNet.Read(address, (short) length);
+ if (result.IsSuccess) {
+ return result.Content;
+ }
+ return new byte[0];
}
private ZyStationStatusEntity findStatusEntity(Integer stationId) {
@@ -201,4 +224,4 @@
}
return -1;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1