From 7c2e048de56976c6ee3757cebf414a0f5c8dcb58 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 22 四月 2024 16:30:09 +0800
Subject: [PATCH] #Ext
---
src/main/java/com/zy/core/thread/MelsecExtThread.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/MelsecExtThread.java b/src/main/java/com/zy/core/thread/MelsecExtThread.java
index 3cab9ee..0b5805f 100644
--- a/src/main/java/com/zy/core/thread/MelsecExtThread.java
+++ b/src/main/java/com/zy/core/thread/MelsecExtThread.java
@@ -4,7 +4,12 @@
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Profinet.Melsec.MelsecMcNet;
import com.core.common.DateUtils;
+import com.core.common.SpringUtils;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.BasExt;
+import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.BasExtService;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -118,10 +123,25 @@
// extProtocol.setMode(melsecMcNet.getByteTransform().TransInt16(result.Content, 0));
// extProtocol.setTaskNo(melsecMcNet.getByteTransform().TransInt16(result.Content, 2));
- OutputQueue.Ext.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-
+// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+ BasExtService extService = SpringUtils.getBean(BasExtService.class);
+ BasExt basExt = new BasExt();
+ basExt.setExtNo(slave.getId());
+ basExt.setExtTask(extProtocol.isTake()?"Y":"N");
+ basExt.setExtPut(extProtocol.isPut()?"Y":"N");
+ if (!extService.updateById(basExt)){
+ log.error("MelsecExt"+" - 4"+" - 鏈烘鑷俻lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ }else {
+ OutputQueue.Ext.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+ }
} else {
+ BasExtService extService = SpringUtils.getBean(BasExtService.class);
+ BasExt basExt = new BasExt();
+ basExt.setExtNo(slave.getId());
+ basExt.setExtTask("N");
+ basExt.setExtPut("N");
+ extService.updateById(basExt);
OutputQueue.Ext.offer(MessageFormat.format("銆恵0}銆憑1}鏈烘鑷俻lc鐘舵�佷俊鎭け璐�",DateUtils.convert(new Date()), slave.getId()));
throw new CoolException(MessageFormat.format( "鏈烘鑷俻lc鐘舵�佷俊鎭け璐� ===>> [id:{0}] [ip:{1}] [port:{2}]", slave.getId(), slave.getIp(), slave.getPort()));
}
--
Gitblit v1.9.1