From 524ed21b54b25493bdda51207b04ce3b44d4bca5 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期一, 25 八月 2025 18:14:08 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 77 +++++++++++++++-----------------------
1 files changed, 30 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 527d5e1..4a12228 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -105,7 +105,7 @@
default:
break;
}
- Thread.sleep(500);
+ Thread.sleep(200);
} catch (Exception e) {
// e.printStackTrace();
}
@@ -282,52 +282,18 @@
log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
- CrnErrCache.updateCrnErr(slave.getId(), "-");
-// try{
-// BasErrLogService basErrLogService = SpringUtils.getBean(BasErrLogService.class);
-// BasErrLog basErrLog = new BasErrLog(command,"","浠诲姟涓嬪彂璁板綍");
-// if (!basErrLogService.insert(basErrLog)) {
-// log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", slave.getId(), "浠诲姟涓嬪彂璁板綍澶辫触");
-// }
-// } catch (Exception e3){
-// }
-// convertRow(command);
- if (command.getAckFinish() == 0){
- try{
- Thread.sleep(100L);
- OperateResultExOne<byte[]> resultReadNOW = siemensNet.Read("DB100.0", (short) 20);
- if (resultReadNOW.IsSuccess) {
- CrnCommand one = new CrnCommand();
- one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultReadNOW.Content, 2));
- one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultReadNOW.Content, 4));
- one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultReadNOW.Content, 6));
- one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultReadNOW.Content, 8));
- one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultReadNOW.Content, 10));
- one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultReadNOW.Content, 12));
- one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultReadNOW.Content, 14));
- one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultReadNOW.Content, 16));
- if (one.getTaskNo()>0
- || one.getTaskMode()>0
- || one.getSourcePosX()!=0
- || one.getSourcePosY()!=0
- || one.getSourcePosZ()!=0
- || one.getDestinationPosX()!=0
- || one.getDestinationPosY()!=0
- || one.getDestinationPosZ()!=0
- ){
- try{
- DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("CrnErr", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍫嗗灈鏈哄懡浠ゅ湴鍧�琛ヤ竵閲嶆柊鍐欏叆鍙栨秷锛寃cs涓嬪彂鍦板潃瀛樺湪鏁版嵁:"+JSON.toJSONString(command.getNowTask()));
- } catch (Exception e2){
- }
- return true;
- }
- }
- } catch (Exception eNow){
-
- }
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("crnWriteIng", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍫嗗灈鏈哄緟涓嬪彂鎸囦护:"+JSON.toJSONString(command.getNowTask()));
+ } catch (Exception e){
}
+ try{
+ CrnErrCache.updateCrnErr(slave.getId(), "-");
+ } catch (Exception e){
+ log.error(JSON.toJSONString(e));
+ log.error("鍫嗗灈鏈轰换鍔″啓寮傚父锛氬紓甯稿畾浣嶅�硷細crnWrite-294琛�");
+ }
command.setCrnNo(slave.getId());
short[] array = new short[10];
@@ -342,9 +308,13 @@
array[8] = command.getDestinationPosZ();
// array[9] = command.getCommand();
array[9] = (short)0;
+
+
+ log.info("鍫嗗灈鏈轰换鍔″啓100.18锛氬�硷細0 crnWrite-313琛�");
OperateResult result18 = siemensNet.Write("DB100.18", (short)0);
if (command.getAckFinish() == 0) {
+ log.info("鍫嗗灈鏈轰换鍔″啓100.0锛氬�硷細0 crnWrite-317琛�");
OperateResult result100 = siemensNet.Write("DB100.0", (short)0);
}
@@ -352,14 +322,18 @@
Thread.sleep(50L);
} catch (Exception e){}
+ log.info("鍫嗗灈鏈轰换鍔″啓100.0锛氬�硷細array crnWrite-317琛�;array:"+JSON.toJSONString(array));
OperateResult result = siemensNet.Write("DB100.0", array);
int i=0;
do{
+ i++;
//鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
try{
Thread.sleep(100L);
} catch (Exception e){}
+
+ log.info("鍫嗗灈鏈轰换鍔¤100.0锛氬�硷細20 crnWrite-317琛�;");
OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
if (resultRead.IsSuccess) {
CrnCommand one = new CrnCommand();
@@ -380,7 +354,6 @@
|| !command.getDestinationPosY().equals(one.getDestinationPosY())
|| !command.getDestinationPosZ().equals(one.getDestinationPosZ())
){
- i++;
CrnErrCache.updateCrnErr(slave.getId(), "鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�");
log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}]>>>>閲嶅啓[{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), i,JSON.toJSON(command),JSON.toJSON(one));
@@ -407,6 +380,16 @@
}
break;
}
+ } else {
+ CrnErrCache.updateCrnErr(slave.getId(), "鍫嗗灈鏈哄懡浠よ鍙栧け璐�");
+
+ log.error("鍫嗗灈鏈哄懡浠よ鍙栧け璐id:{}]>>>>閲嶅啓[{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), i,JSON.toJSON(command),"");
+
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("CrnErr", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍐欏叆娆℃暟"+i+";鍫嗗灈鏈哄懡浠よ鍙栧け璐�:"+JSON.toJSONString(command.getNowTask()));
+ } catch (Exception e2){
+ }
}
}while(i<5);
@@ -418,6 +401,7 @@
result = siemensNet.Write("DB100.18", commandFinish);
int signFinish = 1;
while (signFinish<5){
+ signFinish++;
OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.18", (short) 2);
short transInt16 = siemensNet.getByteTransform().TransInt16(result10018.Content, 0);
if (transInt16 != commandFinish){
@@ -438,7 +422,6 @@
} catch (Exception e3){
}
result = siemensNet.Write("DB100.18", commandFinish);
- signFinish++;
}else {
log.info("涓嬪彂DB100.18" + "commandFinish:"+commandFinish);
log.info("涓嬪彂DB100.18" + "array:"+ JSON.toJSONString(array));
--
Gitblit v1.9.1