From 75be002b86eb7ce4b8ea93ab197faecf975a19d2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 10 九月 2020 10:34:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/CrnThread.java | 104 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 64 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 46a00f7..48943b1 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -6,6 +6,9 @@
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.core.common.DateUtils;
+import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.service.BasCrnpService;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -33,7 +36,7 @@
private SiemensS7Net siemensNet;
private CrnSlave slave;
private CrnProtocol crnProtocol;
-
+ private boolean resetFlag = false;
public CrnThread(CrnSlave slave) {
this.slave = slave;
@@ -46,7 +49,7 @@
while (true) {
try {
int step = 1;
- Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
+ Task task = MessageQueue.poll(SlaveType.Crn, slave.getId());
if (task != null) {
step = task.getStep();
}
@@ -113,7 +116,6 @@
private void readStatus(){
OperateResultExOne<byte[]> result = siemensNet.Read("DB8.18", (short) 56);
if (result.IsSuccess) {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
if (null == crnProtocol) {
crnProtocol = new CrnProtocol();
}
@@ -131,24 +133,40 @@
// 寮傚父淇℃伅
crnProtocol.setError1(siemensNet.getByteTransform().TransBool(result.Content, 22, 2));
crnProtocol.setError2(siemensNet.getByteTransform().TransBool(result.Content, 24, 2));
- crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 26));
- crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
- crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
- crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
- crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
- crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
- crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
- crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
+ crnProtocol.setError3(siemensNet.getByteTransform().TransBool(result.Content, 26, 2));
+ crnProtocol.setError4(siemensNet.getByteTransform().TransBool(result.Content, 28, 2));
+ crnProtocol.setError5(siemensNet.getByteTransform().TransBool(result.Content, 30, 2));
+ crnProtocol.setError6(siemensNet.getByteTransform().TransBool(result.Content, 32, 2));
+ crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 34));
+ crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 38));
+ crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 42));
+ crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 46));
+ crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 50));
+ crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 54));
+ crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 58));
- /**
- * 褰撹鍒皊tatus == 90.浠诲姟瀹屾垚绛夊緟WCS纭 鏃�
- * 涓嬪彂浠诲姟瀹屾垚鎸囦护
- */
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+
+ // 澶嶄綅淇″彿
if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setAckFinish((short)1);
- write(crnCommand);
+ if (resetFlag) {
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setAckFinish((short)1);
+ if (write(crnCommand)) {
+ resetFlag = false;
+ }
+
+ }
}
+
+ // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+ BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ BasCrnp basCrnp = new BasCrnp();
+ basCrnp.setCrnNo(slave.getId());
+ if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
+ log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ }
+
} else {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
@@ -158,10 +176,10 @@
/**
* 鍐欏叆鏁版嵁
*/
- private void write(CrnCommand command){
+ private boolean write(CrnCommand command){
if (null == command) {
log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
- return;
+ return false;
}
command.setCrnNo(slave.getId());
short[] array = new short[9];
@@ -176,13 +194,13 @@
array[8] = command.getDestinationPosZ();
OperateResult result = siemensNet.Write("DB8.0", array);
if (result.IsSuccess) {
- System.out.println(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
-// readStatus();
+ log.info("鍫嗗灈鏈哄懡浠や笅鍙慬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 {
- System.out.println(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ return false;
}
}
@@ -190,14 +208,6 @@
public void close() {
siemensNet.ConnectClose();
}
-
- public CrnProtocol getCrnProtocol(){
- if (crnProtocol == null) {
- readStatus();
- }
- return this.crnProtocol;
- }
-
/******************************************************************************************/
/**************************************** 娴嬭瘯涓撶敤 *****************************************/
@@ -243,18 +253,18 @@
// crnThread.write(command);
-// // 3.搴撲綅绉昏浆 婧愬拰鐩爣閮藉彂
+// // 3.搴撲綅绉昏浆 婧愬拰鐩爣閮藉彂 pass
// CrnCommand command = new CrnCommand();
// command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
// command.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
-// command.setSourcePosX((short)1); // 婧愬簱浣嶆帓
+// command.setSourcePosX((short)2); // 婧愬簱浣嶆帓
// command.setSourcePosY((short)2); // 婧愬簱浣嶅垪
-// command.setSourcePosZ((short)2); // 婧愬簱浣嶅眰
+// command.setSourcePosZ((short)3); // 婧愬簱浣嶅眰
// command.setDestinationPosX((short)2); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short)3); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short)3); // 鐩爣搴撲綅灞�
+// command.setDestinationPosY((short)4); // 鐩爣搴撲綅鍒�
+// command.setDestinationPosZ((short)4); // 鐩爣搴撲綅灞�
// crnThread.write(command);
// 4.绔欎綅绉昏浆 婧愬拰鐩爣閮藉彂
@@ -280,9 +290,9 @@
// command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
// command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
// command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
-// command.setDestinationPosX((short) 2); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY((short) 1); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
+// command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
+// command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
+// command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
// crnThread.write(command);
// // 7.鍧愭爣绉昏 鐩爣鍙� pass
@@ -298,6 +308,20 @@
// command.setDestinationPosY((short) 1); // 鐩爣搴撲綅鍒�
// command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
// crnThread.write(command);
+
+ // 鍙湁鍑虹幇鎸囧畾寮傚父鎵嶈繘琛屽浣�
+// if (crnThread.crnProtocol.getCrnError2().leftTakeNoneErr
+// || crnThread.crnProtocol.getCrnError2().rightTakeNoneErr
+// || crnThread.crnProtocol.getCrnError2().leftPutLoadErr
+// || crnThread.crnProtocol.getCrnError2().rightPutLoadErr) {
+// CrnCommand command = new CrnCommand();
+// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
+// command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
+// command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
+// Thread.sleep(3000L);
+// crnThread.write(command);
+// }
+
}
}
--
Gitblit v1.9.1