From 413148eb01e7105d761598fe5a25372f274b01e2 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 11 二月 2026 11:39:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java | 209 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 169 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java b/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java
index cd57da7..e9841e2 100644
--- a/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java
@@ -14,8 +14,12 @@
import com.zy.asrs.service.BasCrnpOptService;
import com.zy.asrs.service.BasDualCrnpOptService;
import com.zy.asrs.utils.Utils;
+import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.cache.OutputQueue;
+import com.zy.core.enums.CrnTaskModeType;
+import com.zy.core.enums.DualCrnTaskModeType;
+import com.zy.core.enums.RedisKeyType;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.DualCrnCommand;
import com.zy.core.network.api.ZyDualCrnConnectApi;
@@ -23,6 +27,7 @@
import java.text.MessageFormat;
import java.util.Date;
+import java.util.HashMap;
public class ZyDualCrnRealConnect implements ZyDualCrnConnectApi {
@@ -40,10 +45,10 @@
if(connect.IsSuccess){
connected = true;
OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}鍙屽伐浣嶅爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
- News.info("SiemensDualCrn 鍙屽伐浣嶅爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
+ News.info("鍙屽伐浣嶅爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
} else {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}鍙屽伐浣嶅爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
- News.error("SiemensDualCrn 鍙屽伐浣嶅爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
+ News.error("鍙屽伐浣嶅爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
}
// siemensNet.ConnectClose();
return connected;
@@ -58,7 +63,7 @@
@Override
public ZyDualCrnStatusEntity getStatus() {
try {
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 66);
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 70);
if (result.IsSuccess) {
ZyDualCrnStatusEntity crnStatus = new ZyDualCrnStatusEntity();
crnStatus.setCrnNo(deviceConfig.getDeviceNo());
@@ -67,52 +72,175 @@
//宸ヤ綅1
crnStatus.setTaskNo((int) siemensNet.getByteTransform().TransInt16(result.Content, 2));
crnStatus.setStatus((int) siemensNet.getByteTransform().TransInt16(result.Content, 4));
- crnStatus.setForkPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 6));
- crnStatus.setLoaded((int) siemensNet.getByteTransform().TransInt16(result.Content, 8));
- crnStatus.setTaskReceive((int) siemensNet.getByteTransform().TransInt16(result.Content, 10));
+ crnStatus.setBay((int) siemensNet.getByteTransform().TransInt16(result.Content, 6));
+ crnStatus.setLevel((int) siemensNet.getByteTransform().TransInt16(result.Content, 8));
+ crnStatus.setForkPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 10));
+ crnStatus.setLoaded((int) siemensNet.getByteTransform().TransInt16(result.Content, 12));
+ crnStatus.setTaskReceive((int) siemensNet.getByteTransform().TransInt16(result.Content, 14));
//宸ヤ綅2
- crnStatus.setTaskNoTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 12));
- crnStatus.setStatusTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 14));
- crnStatus.setForkPosTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 16));
- crnStatus.setLoadedTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 18));
- crnStatus.setTaskReceiveTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 20));
+ crnStatus.setTaskNoTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 16));
+ crnStatus.setStatusTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 18));
+ crnStatus.setBayTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 20));
+ crnStatus.setLevelTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 22));
+ crnStatus.setForkPosTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 24));
+ crnStatus.setLoadedTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 26));
+ crnStatus.setTaskReceiveTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 28));
- crnStatus.setBay((int) siemensNet.getByteTransform().TransInt16(result.Content, 22));
- crnStatus.setLevel((int) siemensNet.getByteTransform().TransInt16(result.Content, 24));
- crnStatus.setLiftPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 26));
- crnStatus.setWalkPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 28));
- crnStatus.setAlarm((int) siemensNet.getByteTransform().TransInt16(result.Content, 30));
- crnStatus.setTemp1((int) siemensNet.getByteTransform().TransInt16(result.Content, 34));
- crnStatus.setTemp2((int) siemensNet.getByteTransform().TransInt16(result.Content, 36));
- crnStatus.setTemp3((int) siemensNet.getByteTransform().TransInt16(result.Content, 38));
- crnStatus.setTemp4((int) siemensNet.getByteTransform().TransInt16(result.Content, 40));
- crnStatus.setXSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 42));
- crnStatus.setYSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 44));
- crnStatus.setZSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 46));
- crnStatus.setXDistance((int) siemensNet.getByteTransform().TransInt16(result.Content, 48));
- crnStatus.setYDistance((int) siemensNet.getByteTransform().TransInt16(result.Content, 50));
- crnStatus.setXDuration((int) siemensNet.getByteTransform().TransInt16(result.Content, 52));
- crnStatus.setYDuration((int) siemensNet.getByteTransform().TransInt16(result.Content, 54));
- crnStatus.setGoodsType((int) siemensNet.getByteTransform().TransInt16(result.Content, 56));
+ crnStatus.setWalkPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 30));
+ crnStatus.setWalkPosTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 32));
+ crnStatus.setLiftPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 34));
+ crnStatus.setAlarm((int) siemensNet.getByteTransform().TransInt16(result.Content, 36));
+ crnStatus.setXSpeed((double) siemensNet.getByteTransform().TransSingle(result.Content, 38));
+ crnStatus.setYSpeed((double) siemensNet.getByteTransform().TransSingle(result.Content, 42));
+ crnStatus.setZSpeed((double) siemensNet.getByteTransform().TransSingle(result.Content, 46));
+ crnStatus.setZSpeedTwo((double) siemensNet.getByteTransform().TransSingle(result.Content, 50));
+ crnStatus.setXDistance((double) siemensNet.getByteTransform().TransSingle(result.Content, 54));
+ crnStatus.setYDistance((double) siemensNet.getByteTransform().TransSingle(result.Content, 58));
+ crnStatus.setXDuration((double) siemensNet.getByteTransform().TransSingle(result.Content, 62));
+ crnStatus.setYDuration((double) siemensNet.getByteTransform().TransSingle(result.Content, 66));
- String barcode = siemensNet.getByteTransform().TransString(result.Content, 58, 8, "UTF-8");
- crnStatus.setBarcode(barcode);
+ OperateResultExOne<byte[]> taskResult = siemensNet.Read("DB100.0", (short) 18);
+ if (taskResult.IsSuccess) {
+ short taskNo = siemensNet.getByteTransform().TransInt16(taskResult.Content, 0);
+ short taskMode = siemensNet.getByteTransform().TransInt16(taskResult.Content, 2);
+ short sourcePosX = siemensNet.getByteTransform().TransInt16(taskResult.Content, 4);
+ short sourcePosY = siemensNet.getByteTransform().TransInt16(taskResult.Content, 6);
+ short sourcePosZ = siemensNet.getByteTransform().TransInt16(taskResult.Content, 8);
+ short destinationPosX = siemensNet.getByteTransform().TransInt16(taskResult.Content, 10);
+ short destinationPosY = siemensNet.getByteTransform().TransInt16(taskResult.Content, 12);
+ short destinationPosZ = siemensNet.getByteTransform().TransInt16(taskResult.Content, 14);
+ short confirm = siemensNet.getByteTransform().TransInt16(taskResult.Content, 16);
+
+ int hasData = 0;
+ if(taskNo != 0 || taskMode != 0 || sourcePosX != 0 || sourcePosY != 0 || sourcePosZ != 0 || destinationPosX != 0 || destinationPosY != 0 || destinationPosZ != 0 || confirm != 0) {
+ hasData = 1;
+ if (crnStatus.getTaskReceive() == 1) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("taskNo", taskNo);
+ map.put("taskMode", taskMode);
+ map.put("sourcePosX", sourcePosX);
+ map.put("sourcePosY", sourcePosY);
+ map.put("sourcePosZ", sourcePosZ);
+ map.put("destinationPosX", destinationPosX);
+ map.put("destinationPosY", destinationPosY);
+ map.put("destinationPosZ", destinationPosZ);
+ map.put("confirm", confirm);
+
+ short[] array = new short[9];
+ array[0] = (short) 0;
+ array[1] = (short) 0;
+ array[2] = (short) 0;
+ array[3] = (short) 0;
+ array[4] = (short) 0;
+ array[5] = (short) 0;
+ array[6] = (short) 0;
+ array[7] = (short) 0;
+ array[8] = (short) 0;
+
+ boolean clear = false;
+ if (taskMode == DualCrnTaskModeType.CONFIRM.id) {
+// if (crnStatus.getStatus() == 0) {
+// clear = true;
+// }
+ clear = true;
+ } else {
+ clear = true;
+ }
+
+ if (clear) {
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ Object lock = redisUtil.get(RedisKeyType.DUAL_CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo());
+ if (lock == null) {
+ OperateResult taskClearResult = siemensNet.Write("DB100.0", array);
+ redisUtil.set(RedisKeyType.CLEAR_DUAL_CRN_TASK_LIMIT.key + deviceConfig.getDeviceNo(), "lock", 3);
+ News.info("鍙屽伐浣嶅爢鍨涙満:{}鍙穥}宸ヤ綅鍛戒护鍖哄煙娓呯┖锛屽師濮嬫暟鎹�:{}", deviceConfig.getDeviceNo(), 1, JSON.toJSONString(map));
+ }
+ }
+ }
+ }
+ crnStatus.setTaskSend(hasData);
+ }
+
+ OperateResultExOne<byte[]> taskResult2 = siemensNet.Read("DB100.18", (short) 18);
+ if (taskResult2.IsSuccess) {
+ short taskNo = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 0);
+ short taskMode = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 2);
+ short sourcePosX = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 4);
+ short sourcePosY = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 6);
+ short sourcePosZ = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 8);
+ short destinationPosX = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 10);
+ short destinationPosY = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 12);
+ short destinationPosZ = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 14);
+ short confirm = siemensNet.getByteTransform().TransInt16(taskResult2.Content, 16);
+
+ int hasData = 0;
+ if(taskNo != 0 || taskMode != 0 || sourcePosX != 0 || sourcePosY != 0 || sourcePosZ != 0 || destinationPosX != 0 || destinationPosY != 0 || destinationPosZ != 0 || confirm != 0) {
+ hasData = 1;
+ if (crnStatus.getTaskReceiveTwo() == 1) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("taskNo", taskNo);
+ map.put("taskMode", taskMode);
+ map.put("sourcePosX", sourcePosX);
+ map.put("sourcePosY", sourcePosY);
+ map.put("sourcePosZ", sourcePosZ);
+ map.put("destinationPosX", destinationPosX);
+ map.put("destinationPosY", destinationPosY);
+ map.put("destinationPosZ", destinationPosZ);
+ map.put("confirm", confirm);
+
+ short[] array = new short[9];
+ array[0] = (short) 0;
+ array[1] = (short) 0;
+ array[2] = (short) 0;
+ array[3] = (short) 0;
+ array[4] = (short) 0;
+ array[5] = (short) 0;
+ array[6] = (short) 0;
+ array[7] = (short) 0;
+ array[8] = (short) 0;
+
+ boolean clear = false;
+ if (taskMode == DualCrnTaskModeType.CONFIRM.id) {
+// if (crnStatus.getStatusTwo() == 0) {
+// clear = true;
+// }
+ clear = true;
+ } else {
+ clear = true;
+ }
+
+ if (clear) {
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ Object lock = redisUtil.get(RedisKeyType.DUAL_CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo());
+ if (lock == null) {
+ OperateResult taskClearResult = siemensNet.Write("DB100.18", array);
+ redisUtil.set(RedisKeyType.CLEAR_DUAL_CRN_TASK_LIMIT.key + deviceConfig.getDeviceNo(), "lock", 3);
+ News.info("鍙屽伐浣嶅爢鍨涙満:{}鍙穥}宸ヤ綅鍛戒护鍖哄煙娓呯┖锛屽師濮嬫暟鎹�:{}", deviceConfig.getDeviceNo(), 2, JSON.toJSONString(map));
+ }
+ }
+ }
+ }
+ crnStatus.setTaskSendTwo(hasData);
+ }
+
return crnStatus;
} else {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧弻宸ヤ綅鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
- News.error("SiemensCrn 璇诲彇鍙屽伐浣嶅爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
+ News.error("璇诲彇鍙屽伐浣嶅爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
}
} catch (Exception e) {
e.printStackTrace();
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧弻宸ヤ綅鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
- News.error("SiemensCrn 璇诲彇鍙屽伐浣嶅爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
+ News.error("璇诲彇鍙屽伐浣嶅爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
}
return null;
}
@Override
public CommandResponse sendCommand(DualCrnCommand command) {
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ redisUtil.set(RedisKeyType.DUAL_CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo(), "lock", 10);
CommandResponse response = new CommandResponse(false);
try {
if (null == command) {
@@ -161,14 +289,14 @@
do {
OperateResultExOne<byte[]> resultRead = siemensNet.Read(address, (short) 18);
if (resultRead.IsSuccess) {
- short taskNo = siemensNet.getByteTransform().TransInt16(resultRead.Content, 2);
- short taskMode = siemensNet.getByteTransform().TransInt16(resultRead.Content, 4);
- short sourcePosX = siemensNet.getByteTransform().TransInt16(resultRead.Content, 6);
- short sourcePosY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 8);
- short sourcePosZ = siemensNet.getByteTransform().TransInt16(resultRead.Content, 10);
- short destinationPosX = siemensNet.getByteTransform().TransInt16(resultRead.Content, 12);
- short destinationPosY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 14);
- short destinationPosZ = siemensNet.getByteTransform().TransInt16(resultRead.Content, 16);
+ short taskNo = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
+ short taskMode = siemensNet.getByteTransform().TransInt16(resultRead.Content, 2);
+ short sourcePosX = siemensNet.getByteTransform().TransInt16(resultRead.Content, 4);
+ short sourcePosY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 6);
+ short sourcePosZ = siemensNet.getByteTransform().TransInt16(resultRead.Content, 8);
+ short destinationPosX = siemensNet.getByteTransform().TransInt16(resultRead.Content, 10);
+ short destinationPosY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 12);
+ short destinationPosZ = siemensNet.getByteTransform().TransInt16(resultRead.Content, 14);
if (taskNo == 0 || taskMode == 0 || sourcePosX == 0 || sourcePosY == 0 || sourcePosZ == 0 || destinationPosX == 0 || destinationPosY == 0 || destinationPosZ == 0) {
result = siemensNet.Write(address, array);
} else {
@@ -191,6 +319,7 @@
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), command.getCrnNo(), JSON.toJSON(command)));
response.setResult(true);
response.setMessage("鍛戒护涓嬪彂鎴愬姛");
+ redisUtil.set(RedisKeyType.DUAL_CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo(), "lock", 5);
} else {
News.error("鍙屽伐浣嶅爢鍨涙満鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}]", command.getCrnNo());
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}]", DateUtils.convert(new Date()), command.getCrnNo()));
--
Gitblit v1.9.1