From f103eb4fde47b0229b561329f66574db81257dd5 Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期三, 20 十一月 2024 10:46:45 +0800
Subject: [PATCH] Merge branch 'herb' of https://gitee.com/baoshwi/herb into herb

---
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/runner/OpcCustomRunner.java |  116 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/runner/OpcCustomRunner.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/runner/OpcCustomRunner.java
index 98bb58d..e9149dd 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/runner/OpcCustomRunner.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/runner/OpcCustomRunner.java
@@ -1,58 +1,58 @@
-//package org.jeecg.modules.dry.runner;
-//
-//import com.alibaba.fastjson.JSON;
-//import com.kangaroohy.milo.service.MiloService;
-//import lombok.extern.slf4j.Slf4j;
-//import org.jeecg.modules.dry.entity.DryOpcDevice;
-//import org.jeecg.modules.dry.service.IDryOpcDeviceService;
-//import org.jeecg.modules.dry.vo.DryOpcMsgVo;
-//import org.jeecg.modules.dry.websocket.DrySocket;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.ApplicationArguments;
-//import org.springframework.boot.ApplicationRunner;
-//import org.springframework.stereotype.Component;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-//@Component
-//@Slf4j
-//public class OpcCustomRunner implements ApplicationRunner {
-//    @Autowired
-//    private MiloService miloService;
-//
-//
-//    @Autowired
-//    private IDryOpcDeviceService dryOpcDeviceService;
-//
-//    @Autowired
-//    private DrySocket drySocket;
-//    @Override
-//    public void run(ApplicationArguments args) throws Exception {
-//
-//        subscript();
-//
-//    }
-//
-//    private void subscript() throws Exception {
-//        List<String> ids = new ArrayList<>();
-//        List<DryOpcDevice> list = dryOpcDeviceService.list();
-//        list.forEach(item -> {
-//            ids.add(item.getIdentifier());
-//        });
-////        ids.add("閫氶亾 1.璁惧 1.鏍囪 1");
-////        ids.add("閫氶亾 1.璁惧 1.鏍囪 2");
-////        ids.add("channel1.device1.tag1");
-////        ids.add("channel1.device1.tag2");
-////        ids.add("channel1.device1.tag3");
-////        ids.add("channel1.device1.tag4");
-////        ids.add("channel1.device1.tag5");
-////        ids.add("channel1.device1.tag6");
-//        miloService.subscriptionFromOpcUa(ids, (id,value)->{
-//            log.info("subscription 鐐逛綅锛歿} 璁㈤槄鍒版秷鎭細{}", id, value);
-//
-//            DryOpcMsgVo dryOpcMsgVo = new DryOpcMsgVo(id, (Boolean) value);
-//            drySocket.pushMessage("1003", JSON.toJSONString(dryOpcMsgVo));
-//        } );
-//    }
-//}
+package org.jeecg.modules.dry.runner;
+
+import com.alibaba.fastjson.JSON;
+import com.kangaroohy.milo.service.MiloService;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.dry.entity.DryOpcDevice;
+import org.jeecg.modules.dry.service.IDryOpcDeviceService;
+import org.jeecg.modules.dry.vo.DryOpcMsgVo;
+import org.jeecg.modules.dry.websocket.DrySocket;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+@Slf4j
+public class OpcCustomRunner implements ApplicationRunner {
+    @Autowired
+    private MiloService miloService;
+
+
+    @Autowired
+    private IDryOpcDeviceService dryOpcDeviceService;
+
+    @Autowired
+    private DrySocket drySocket;
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+
+        subscript();
+
+    }
+
+    private void subscript() throws Exception {
+        List<String> ids = new ArrayList<>();
+        List<DryOpcDevice> list = dryOpcDeviceService.list();
+        list.forEach(item -> {
+            ids.add(item.getIdentifier());
+        });
+//        ids.add("閫氶亾 1.璁惧 1.鏍囪 1");
+//        ids.add("閫氶亾 1.璁惧 1.鏍囪 2");
+//        ids.add("channel1.device1.tag1");
+//        ids.add("channel1.device1.tag2");
+//        ids.add("channel1.device1.tag3");
+//        ids.add("channel1.device1.tag4");
+//        ids.add("channel1.device1.tag5");
+//        ids.add("channel1.device1.tag6");
+        miloService.subscriptionFromOpcUa(ids, (id,value)->{
+            log.info("subscription 鐐逛綅锛歿} 璁㈤槄鍒版秷鎭細{}", id, value);
+
+            DryOpcMsgVo dryOpcMsgVo = new DryOpcMsgVo(id, (Boolean) value);
+            drySocket.pushMessage("1003", JSON.toJSONString(dryOpcMsgVo));
+        } );
+    }
+}

--
Gitblit v1.9.3