From e83ed4d170a69677fe9d0bb91a12035b7b056cfa Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 11 八月 2020 15:38:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7 +++++--
src/main/java/com/zy/core/thread/CrnThread.java | 17 ++++++++++++++---
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 3f1c98e..864019f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -515,10 +515,13 @@
wrkMast.setModiTime(now);
// 淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
if (wrkMastMapper.updateById(wrkMast) > 0) {
-
+ // 鍛戒护涓嬪彂鍖� -------------------------------------------------------------------------
+ // 澶嶄綅
+ if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(3, new CrnCommand()))) {
+ log.error("鍫嗗灈鏈哄浣嶅懡浠や笅鍙戝け璐ワ紝宸ヤ綔鍙�={}", wrkMast.getWrkNo());
+ }
}
}
-
}
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 4839c5b..4ac451e 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -6,6 +6,7 @@
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
+import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.Task;
@@ -50,10 +51,20 @@
case 2:
write((CrnCommand) task.getData());
break;
- case 3:
- break;
// 澶嶄綅
- case 4:
+ case 3:
+ CrnCommand command = (CrnCommand) task.getData();
+ command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
+ command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+ command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
+ command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
+ command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
+ command.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
+ write(command);
break;
default:
break;
--
Gitblit v1.9.1