From 6abae920ad543ebdc3ee2e386828dd65e4c5ec35 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:21:53 +0800
Subject: [PATCH] 1、opc订阅服务同时订阅一个节点两次,仅一个订阅任务生效,将进出片任务/完成任务放在一起 2、移除原片仓储中的下发字段

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
index 57be771..4bab88f 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
@@ -25,18 +25,10 @@
     @Resource(name = "cacheGlassStartCallback")
     SubscriptionCallback cacheGlassStartCallback;
 
-    @Resource(name = "cacheGlassFinishCallback")
-    SubscriptionCallback cacheGlassFinishCallback;
-
     @Scheduled(fixedDelay = Long.MAX_VALUE)
     public void startOpcTask() throws Exception {
-        miloService.subscriptionFromOpcUa(Arrays.asList("my.device01.x1", "my.device02.x1"), cacheGlassStartCallback);
-        log.info("--------------------s---------------------------");
-    }
-
-    @Scheduled(fixedDelay = Long.MAX_VALUE)
-    public void finishOpcTask() throws Exception {
-        miloService.subscriptionFromOpcUa(Arrays.asList("my.device01.x2", "my.device02.x2"), cacheGlassFinishCallback);
+//        miloService.subscriptionFromOpcUa(Arrays.asList("C101-WL.S7-1200.plc_task_state", "D101-WL.S7-1200.plc_task_state"), cacheGlassStartCallback);
+        miloService.subscriptionFromOpcUa(Arrays.asList("mes.dec.edg_storage_device_one_task[1].task_state", "D101-WL.S7-1200.plc_task_state"), cacheGlassStartCallback);
         log.info("--------------------s---------------------------");
     }
 }

--
Gitblit v1.8.0