From 27836d1b0bc74a5aa22a8b6c7cf40f2d0068db8a Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 11 二月 2026 13:40:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java | 151 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 114 insertions(+), 37 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 c6a49ee..b85fb99 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;
@@ -95,21 +100,34 @@
crnStatus.setXDuration((double) siemensNet.getByteTransform().TransSingle(result.Content, 62));
crnStatus.setYDuration((double) siemensNet.getByteTransform().TransSingle(result.Content, 66));
- if (crnStatus.getStatus() == 0 && crnStatus.getTaskReceive() == 0) {
- 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);
+ 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);
- if(taskNo != 0 || taskMode != 0 || sourcePosX != 0 || sourcePosY != 0 || sourcePosZ != 0 || destinationPosX != 0 || destinationPosY != 0 || destinationPosZ != 0 || confirm != 0) {
- short[] array = new short[10];
+ 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;
@@ -119,27 +137,59 @@
array[6] = (short) 0;
array[7] = (short) 0;
array[8] = (short) 0;
- array[9] = (short) 0;
- OperateResult taskClearResult = siemensNet.Write("DB100.0", array);
+
+ 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);
}
- if (crnStatus.getStatusTwo() == 0 && crnStatus.getTaskReceiveTwo() == 0) {
- OperateResultExOne<byte[]> taskResult = siemensNet.Read("DB100.18", (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);
+ 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);
- if(taskNo != 0 || taskMode != 0 || sourcePosX != 0 || sourcePosY != 0 || sourcePosZ != 0 || destinationPosX != 0 || destinationPosY != 0 || destinationPosZ != 0 || confirm != 0) {
- short[] array = new short[10];
+ 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;
@@ -149,27 +199,48 @@
array[6] = (short) 0;
array[7] = (short) 0;
array[8] = (short) 0;
- array[9] = (short) 0;
- OperateResult taskClearResult = siemensNet.Write("DB100.18", array);
+
+ 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) {
@@ -196,8 +267,13 @@
confirmAddress = "DB100.34";
}
+ short sendTaskNo = command.getTaskNo().shortValue();
+ if(command.getTaskMode().equals(DualCrnTaskModeType.CONFIRM.id)) {
+ sendTaskNo = 0;
+ }
+
short[] array = new short[9];
- array[0] = command.getTaskNo().shortValue();
+ array[0] = sendTaskNo;
array[1] = command.getTaskMode().shortValue();
array[2] = command.getSourcePosX().shortValue();
array[3] = command.getSourcePosY().shortValue();
@@ -248,6 +324,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