From b2141320243f2be393236a3c4f53376583179325 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 16 三月 2026 10:36:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/ZyCrnConnectDriver.java | 4 -
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java | 36 ------------
src/main/java/com/zy/core/network/api/ZyCrnConnectApi.java | 2
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java | 2
src/main/java/com/zy/core/thread/CrnThread.java | 2
src/main/java/com/zy/core/network/fake/ZyCrnFakeConnect.java | 17 -----
src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java | 101 ---------------------------------
7 files changed, 1 insertions(+), 163 deletions(-)
diff --git a/src/main/java/com/zy/core/network/ZyCrnConnectDriver.java b/src/main/java/com/zy/core/network/ZyCrnConnectDriver.java
index e885eb5..b6fc912 100644
--- a/src/main/java/com/zy/core/network/ZyCrnConnectDriver.java
+++ b/src/main/java/com/zy/core/network/ZyCrnConnectDriver.java
@@ -97,10 +97,6 @@
return zyCrnConnectApi.sendCommand(command);
}
- public CommandResponse sendCommand1(CrnCommand command) {
- return zyCrnConnectApi.sendCommand1(command);
- }
-
public CommandResponse sendCommand2(CrnCommand command) {
return zyCrnConnectApi.sendCommand2(command);
}
diff --git a/src/main/java/com/zy/core/network/api/ZyCrnConnectApi.java b/src/main/java/com/zy/core/network/api/ZyCrnConnectApi.java
index 3824f39..09c1c11 100644
--- a/src/main/java/com/zy/core/network/api/ZyCrnConnectApi.java
+++ b/src/main/java/com/zy/core/network/api/ZyCrnConnectApi.java
@@ -14,8 +14,6 @@
CommandResponse sendCommand(CrnCommand command);//涓嬪彂鍛戒护
- CommandResponse sendCommand1(CrnCommand command);
-
CommandResponse sendCommand2(CrnCommand command);
CommandResponse sendCommand3(CrnCommand command);
diff --git a/src/main/java/com/zy/core/network/fake/ZyCrnFakeConnect.java b/src/main/java/com/zy/core/network/fake/ZyCrnFakeConnect.java
index 26986f6..3413d40 100644
--- a/src/main/java/com/zy/core/network/fake/ZyCrnFakeConnect.java
+++ b/src/main/java/com/zy/core/network/fake/ZyCrnFakeConnect.java
@@ -56,23 +56,6 @@
}
@Override
- public CommandResponse sendCommand1(CrnCommand command) {
- CommandResponse response = new CommandResponse(false);
- if (command.getTaskMode().intValue() == CrnTaskModeType.LOC_MOVE.id) {
- //鍙栨斁璐�
- executor.submit(() -> commandTake(command));
- } else if (command.getTaskMode().intValue() == CrnTaskModeType.CRN_MOVE.id) {
- //绉诲姩
- executor.submit(() -> commandMove(command));
- } else if (command.getTaskMode().intValue() == CrnTaskModeType.NONE.id) {
- //澶嶄綅
- executor.submit(() -> commandTaskComplete(command));
- }
- response.setResult(true);
- return response;
- }
-
- @Override
public CommandResponse sendCommand2(CrnCommand command) {
return null;
}
diff --git a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
index 6608a6e..9215b2c 100644
--- a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
@@ -213,107 +213,6 @@
}
@Override
- public CommandResponse sendCommand1(CrnCommand command) {
- CommandResponse response = new CommandResponse(false);
- try {
- if (null == command) {
- News.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
- response.setMessage("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
- return response;
- }
-
- int writeAck = 0;
- do {
- OperateResult resultAck = siemensNet.Write("DB100.0", (short) 0);
- if (resultAck.IsSuccess) {
- Thread.sleep(200);
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 2);
- short ack = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
- if (ack != 0) {
- writeAck++;
- } else {
- News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", command.getCrnNo(), "ack澶嶄綅瀹屾垚");
- break;
- }
- }
- } while (writeAck < 5);
-
- short[] array = new short[10];
- array[0] = (short) 1;
- array[1] = command.getTaskNo().shortValue();
- array[2] = command.getTaskMode().shortValue();
- array[3] = command.getSourcePosX().shortValue();
- array[4] = command.getSourcePosY().shortValue();
- array[5] = command.getSourcePosZ().shortValue();
- array[6] = command.getDestinationPosX().shortValue();
- array[7] = command.getDestinationPosY().shortValue();
- array[8] = command.getDestinationPosZ().shortValue();
- array[9] = (short) 0;
-
- OperateResult result = siemensNet.Write("DB100.0", array);
- if (!result.IsSuccess) {
- response.setMessage("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}" + command.getCrnNo() + "浠诲姟鐘舵�佷綅寮傚父");
- return response;
- }
-
- int idx = 0;
- do {
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
- 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);
- if (taskNo == 0 || taskMode == 0 || sourcePosX == 0 || sourcePosY == 0 || sourcePosZ == 0 || destinationPosX == 0 || destinationPosY == 0 || destinationPosZ == 0) {
- result = siemensNet.Write("DB100.0", array);
- } else {
- break;
- }
- }
- idx++;
- Thread.sleep(500);
- } while (idx < 5);
-
- if (result != null && result.IsSuccess) {
- News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", command.getCrnNo(), JSON.toJSON(command));
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), command.getCrnNo(), JSON.toJSON(command)));
- response.setResult(true);
- response.setMessage("鍛戒护涓嬪彂鎴愬姛");
- } else {
- News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}]", command.getCrnNo());
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}]", DateUtils.convert(new Date()), command.getCrnNo()));
- response.setResult(false);
- response.setMessage("鍛戒护涓嬪彂澶辫触");
- }
-
- if (!Cools.isEmpty(command.getLocNo())){
- OperateResult resultAck = siemensNet.Write("DB110." + command.getIndex() * 2, command.getValue());
- if (resultAck.IsSuccess) {
- Integer index = command.getIndex()*2 + 200;
- OperateResult resultAck1 = siemensNet.Write("DB110." + index, command.getValue());
- if (resultAck1.IsSuccess) {
- News.info("搴撲綅姗欒壊鎸夐挳鍛戒护涓嬪彂[locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
- } else {
- News.error("搴撲綅鐧借壊鐏懡浠や笅鍙戝け璐locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
- }
- News.info("搴撲綅鐧借壊鐏懡浠や笅鍙慬locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
- } else {
- News.error("搴撲綅鐧借壊鐏懡浠や笅鍙戝け璐locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
- }
- }
-
- return response;
- } catch (Exception e) {
- e.printStackTrace();
- }
- return response;
- }
-
- @Override
public CommandResponse sendCommand2(CrnCommand command) {
CommandResponse response = new CommandResponse(false);
try {
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 50011bc..9847f2b 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -17,8 +17,6 @@
CommandResponse sendCommand(CrnCommand command);//涓嬪彂鍛戒护
- CommandResponse sendCommand1(CrnCommand command);
-
CommandResponse sendCommand2(CrnCommand command);
CommandResponse sendCommand3(CrnCommand command);
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
index 01993be..b7320d4 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -81,14 +81,11 @@
if (step == 2) {
sendCommand((CrnCommand) task.getData());
- }else if (step == 3) {
- sendCommand1((CrnCommand) task.getData());
}else if (step == 4) {
sendCommand2((CrnCommand) task.getData());
}else if (step == 5) {
sendCommand3((CrnCommand) task.getData());
}
-
Thread.sleep(100);
} catch (Exception e) {
@@ -315,39 +312,6 @@
CommandResponse response = null;
try {
response = zyCrnConnectDriver.sendCommand(command);
- return response;
- } finally {
- String sourceLocNo = Utils.getLocNo(command.getSourcePosX(), command.getSourcePosY(), command.getSourcePosZ());
- String targetLocNo = Utils.getLocNo(command.getDestinationPosX(), command.getDestinationPosY(), command.getDestinationPosZ());
- BasCrnpOptService bean = SpringUtils.getBean(BasCrnpOptService.class);
- ZyCrnStatusEntity statusEntity = zyCrnConnectDriver.getStatus();
- BasCrnpOpt basCrnpOpt = new BasCrnpOpt(
- command.getTaskNo().intValue(),
- command.getCrnNo(),
- new Date(),
- String.valueOf(command.getTaskMode()),
- sourceLocNo,
- targetLocNo,
- null,
- null,
- null,
- JSON.toJSONString(command),
- JSON.toJSONString(statusEntity),
- 1,
- JSON.toJSONString(response)
- );
- if (bean != null) {
- bean.insert(basCrnpOpt);
- }
- }
- }
-
- @Override
- public synchronized CommandResponse sendCommand1(CrnCommand command) {
- this.crnProtocol.setLastCommandTime(System.currentTimeMillis());
- CommandResponse response = null;
- try {
- response = zyCrnConnectDriver.sendCommand1(command);
return response;
} finally {
String sourceLocNo = Utils.getLocNo(command.getSourcePosX(), command.getSourcePosY(), command.getSourcePosZ());
diff --git a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
index 2bd254b..b7773c8 100644
--- a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -658,7 +658,7 @@
resetCommand.setIndex(i);
resetCommand.setValue((short)0);
}
- MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(3, resetCommand));
+ MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(2, resetCommand));
News.info("鍫嗗灈鏈轰换鍔＄姸鎬佹洿鏂版垚鍔燂紝鍫嗗灈鏈哄彿={}锛屽伐浣滃彿={}", basCrnp.getCrnNo(), crnProtocol.getTaskNo());
}
--
Gitblit v1.9.1