From bfd2b9f7dda8688eec86a300c418a8531b5d7326 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 19 六月 2025 11:55:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 108 ------------------------------------------------------
1 files changed, 0 insertions(+), 108 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index b8771b0..1dd59a3 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -92,9 +92,6 @@
command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
write(command);
break;
- case 4://鍫嗗灈鏈虹Щ鍔�
- writeMove((CrnCommand) task.getData());
- break;
default:
break;
}
@@ -361,111 +358,6 @@
return false;
}
}
-
- /**
- * 鍐欏叆鏁版嵁
- */
- private boolean writeMove(CrnCommand command) throws InterruptedException {
- if (null == command) {
- News.error("SiemensCrn"+" - 6"+" - 鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
- return false;
- }
-
-// 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:{}] >>>>> {}", slave.getId(), "ack澶嶄綅瀹屾垚");
-// break;
-// }
-// }
-// }while (writeAck <5);
-
-// convertRow(command);
- command.setCrnNo(slave.getId());
- short[] array = new short[4];
- array[0] = command.getSourcePosX();
- array[1] = command.getSourcePosY();
- array[2] = command.getSourcePosZ();
- array[3] = command.getTaskMode();
-
- OperateResult result = null;
- int idx = 0;
- do {
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.26", (short) 2);
- if (resultRead.IsSuccess) {
- short posY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
- if(posY == 0) {
- result = siemensNet.Write("DB100.24", array);
- }else {
- break;
- }
- }
- idx++;
- Thread.sleep(500L);
- } while (idx < 5);
-
- if (command.getAckFinish() == 0) {
- short commandFinish = 1;
- int i = 0;
- do {
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.26", (short) 2);
- OperateResultExOne<byte[]> resultReadConfirm = siemensNet.Read("DB100.22", (short) 2);
- if (resultRead.IsSuccess && resultReadConfirm.IsSuccess) {
- short posY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
- short confirm = siemensNet.getByteTransform().TransInt16(resultReadConfirm.Content, 0);
- if(posY != 0 && confirm == 0) {
- result = siemensNet.Write("DB100.22", commandFinish);
- }
- }
- i++;
- Thread.sleep(500L);
- } while (i < 5);
- }
-
- this.crnProtocol.setLastCommandTime(System.currentTimeMillis());
- try {
- // 鏃ュ織璁板綍
- BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
- BasCrnOpt basCrnOpt = new BasCrnOpt(
- command.getTaskNo().intValue(), // 浠诲姟鍙�
- command.getCrnNo(), // 鍫嗗灈鏈篬闈炵┖]
- new Date(), // 涓嬪彂鏃堕棿
- command.getTaskModeType().toString(), // 妯″紡
- command.getSourcePosX().intValue(), // 婧愭帓
- command.getSourcePosY().intValue(), // 婧愬垪
- command.getSourcePosZ().intValue(), // 婧愬眰
- null, // 婧愮珯
- command.getDestinationPosX().intValue(), // 鐩爣鎺�
- command.getDestinationPosY().intValue(), // 鐩爣鍒�
- command.getDestinationPosZ().intValue(), // 鐩爣灞�
- null, // 鐩爣绔�
- null, // 鍝嶅簲缁撴灉
- null, // 淇敼鏃堕棿
- null // 淇敼浜哄憳
- );
- bean.insert(basCrnOpt);
- } catch (Exception ignore) {}
-
- if (result != null && result.IsSuccess) {
- Thread.sleep(200);
- this.readStatus();
- News.info("SiemensCrn"+" - 7"+" - 鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
- return true;
- } else {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- News.error("SiemensCrn"+" - 8"+" - 鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- return false;
- }
- }
-
@Override
public void close() {
--
Gitblit v1.9.1