From eb309a4d81a3b4ca666a403e4f8dfd8ecaec609a Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期六, 28 六月 2025 12:55:33 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 100 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 40592be..1074858 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -12,7 +12,9 @@
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.service.BasCrnOptService;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.DeviceErrorService;
import com.zy.core.CrnThread;
+import com.zy.core.cache.CrnErrCache;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.CrnStatusType;
@@ -49,6 +51,7 @@
* 鍫嗗灈鏈烘槸鍚﹀湪鍥炲師鐐硅繍鍔ㄤ腑鏍囪
*/
private boolean backHpFlag = false;
+ public Long currentTimeMilliConnectCrn= 0L;
public SiemensCrnThread(CrnSlave slave) {
this.slave = slave;
@@ -91,6 +94,25 @@
command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
write(command);
+ break;
+ // 澶嶄綅
+ case 4:
+ CrnCommand command4 = (CrnCommand) task.getData();
+ if (null == command4) {
+ command4 = new CrnCommand();
+ }
+ command4.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+ command4.setTaskNo((short) 9999); // 宸ヤ綔鍙�
+ command4.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ command4.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡
+ command4.setSourcePosX((short)0); // 婧愬簱浣嶆帓
+ command4.setSourcePosY((short)0); // 婧愬簱浣嶅垪
+ command4.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
+ int row = slave.getId() * 2;
+ command4.setDestinationPosX((short)row); // 鐩爣搴撲綅鎺�
+ command4.setDestinationPosY((short)1); // 鐩爣搴撲綅鍒�
+ command4.setDestinationPosZ((short)1); // 鐩爣搴撲綅灞�
+ write(command4);
break;
default:
break;
@@ -155,12 +177,12 @@
*/
private void readStatus(){
try {
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 58);
if (result.IsSuccess) {
if (null == crnProtocol) {
crnProtocol = new CrnProtocol();
- crnProtocol.setCrnNo(slave.getId());
}
+ crnProtocol.setCrnNo(slave.getId());
crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
@@ -182,6 +204,7 @@
crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
+ crnProtocol.setLaneNo((int)siemensNet.getByteTransform().TransInt16(result.Content, 56));//宸烽亾鍙�
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -216,6 +239,21 @@
initCrn();
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());
+ if (System.currentTimeMillis()-currentTimeMilliConnectCrn>1000*60*10){
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("Crn", slave.getId(), "璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐�");
+ } catch (Exception e2){
+ Thread.sleep(1000);
+// log.error("e2:"+e2.getMessage());
+ }
+ if (currentTimeMilliConnectCrn == 0){
+ currentTimeMilliConnectCrn = System.currentTimeMillis()-1000*60*10-1;
+ } else {
+ currentTimeMilliConnectCrn = System.currentTimeMillis();
+
+ }
+ }
}
} catch (Exception e) {
e.printStackTrace();
@@ -242,6 +280,8 @@
log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
+ CrnErrCache.updateCrnErr(slave.getId(), "-");
+
// convertRow(command);
command.setCrnNo(slave.getId());
short[] array = new short[10];
@@ -254,15 +294,60 @@
array[6] = command.getDestinationPosX();
array[7] = command.getDestinationPosY();
array[8] = command.getDestinationPosZ();
-// array[9] = command.getSourceStaNo();
-// array[10] = command.getDestinationStaNo();
array[9] = command.getCommand();
+ OperateResult result18 = siemensNet.Write("DB100.18", (short)0);
+ try{
+ Thread.sleep(50L);
+ } catch (Exception e){}
+
OperateResult result = siemensNet.Write("DB100.0", array);
+
+ int i=0;
+ do{
+ //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+ try{
+ Thread.sleep(100L);
+ } catch (Exception e){}
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB101.0", (short) 4);
+ if (resultRead.IsSuccess) {
+ CrnCommand one = new CrnCommand();
+ one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
+ if (!command.getTaskNo().equals(one.getTaskNo())
+ ){
+ i++;
+ CrnErrCache.updateCrnErr(slave.getId(), "鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�");
+
+ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}]>>>>閲嶅啓[{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), i,JSON.toJSON(command),JSON.toJSON(one));
+ result = siemensNet.Write("DB100.0", array);
+ }else{
+ break;
+ }
+ }
+ }while(i<5);
if (command.getAckFinish() == 0) {
short commandFinish = 1;
- Thread.sleep(100L);
+ try{
+ Thread.sleep(100L);
+ } catch (Exception e){}
result = siemensNet.Write("DB100.18", commandFinish);
+ int signFinish = 1;
+ while (signFinish<5){
+ OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.18", (short) 2);
+ short transInt16 = siemensNet.getByteTransform().TransInt16(result10018.Content, 0);
+ if (transInt16 != commandFinish){
+ log.info("涓嬪彂DB100.18 鍥炶澶辫触" + "commandFinish:"+commandFinish);
+ log.info("涓嬪彂DB100.18 鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
+ CrnErrCache.updateCrnErr(slave.getId(), "涓嬪彂DB100.18 鍥炶澶辫触");
+
+ result = siemensNet.Write("DB100.18", commandFinish);
+ signFinish++;
+ }else {
+ log.info("涓嬪彂DB100.18" + "commandFinish:"+commandFinish);
+ log.info("涓嬪彂DB100.18" + "array:"+ JSON.toJSONString(array));
+ break;
+ }
+ }
}
try {
@@ -297,6 +382,8 @@
} else {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ CrnErrCache.updateCrnErr(slave.getId(), "鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触");
+
return false;
}
}
@@ -427,4 +514,12 @@
isRunning = false;
}
+
+ /**
+ * 娓呴櫎浣滀笟鍚姩涓�
+ */
+ @Override
+ public void setWrkSign() {
+ }
+
}
--
Gitblit v1.9.1