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 | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 51f727f..1074858 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -12,6 +12,7 @@
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;
@@ -50,6 +51,7 @@
* 鍫嗗灈鏈烘槸鍚﹀湪鍥炲師鐐硅繍鍔ㄤ腑鏍囪
*/
private boolean backHpFlag = false;
+ public Long currentTimeMilliConnectCrn= 0L;
public SiemensCrnThread(CrnSlave slave) {
this.slave = slave;
@@ -92,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;
@@ -218,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();
@@ -478,4 +514,12 @@
isRunning = false;
}
+
+ /**
+ * 娓呴櫎浣滀笟鍚姩涓�
+ */
+ @Override
+ public void setWrkSign() {
+ }
+
}
--
Gitblit v1.9.1