From abb175b29054b9708af27136c035b1b7351dcd20 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期二, 14 十一月 2023 13:18:48 +0800
Subject: [PATCH] 优化
---
guns-vip-main/src/main/java/cn/stylefeng/guns/opcua/client/ClientHandler.java | 66 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 12 deletions(-)
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/opcua/client/ClientHandler.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/opcua/client/ClientHandler.java
index 008716b..7878868 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/opcua/client/ClientHandler.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/opcua/client/ClientHandler.java
@@ -1,5 +1,8 @@
package cn.stylefeng.guns.opcua.client;
+import cn.stylefeng.guns.opcua.controller.OpcuaConfController;
+import cn.stylefeng.guns.opcua.model.params.OpcuaConfParam;
+import cn.stylefeng.guns.opcua.model.result.OpcuaConfResult;
import com.google.common.collect.ImmutableList;
import cn.stylefeng.guns.opcua.entity.NodeEntity;
import lombok.extern.slf4j.Slf4j;
@@ -21,6 +24,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import cn.stylefeng.guns.base.enums.MicroTimestamp;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -38,10 +42,16 @@
public class ClientHandler {
// 瀹㈡埛绔疄渚�
- private OpcUaClient client = null;
+ public static OpcUaClient client = null;
+
+ public List<OpcuaConfResult> b = null;
@Autowired
private ClientRunner clientRunner;
+
+ @Autowired
+ private OpcuaConfController opcuaConfController;
+
/**
*
@@ -98,8 +108,6 @@
return "鎵句笉鍒板鎴风锛屾搷浣滃け璐�";
}
-// List<Node> ns = client.getAddressSpace().browse(new NodeId(2, "妯℃嫙閫氶亾涓�.妯℃嫙璁惧涓�")).get();
-
// 鏌ヨ璁㈤槄瀵硅薄锛屾病鏈夊垯鍒涘缓
UaSubscription subscription = null;
ImmutableList<UaSubscription> subscriptionList = client.getSubscriptionManager().getSubscriptions();
@@ -133,7 +141,7 @@
// 鍒涘缓鐩戞帶椤癸紝骞朵笖娉ㄥ唽鍙橀噺鍊兼敼鍙樻椂鍊欑殑鍥炶皟鍑芥暟
subscription.createMonitoredItems(TimestampsToReturn.Both, requests, (item, id) -> {
item.setValueConsumer((i, v) -> {
- handle(i.getReadValueId().getNodeId(), v.getValue());
+ handle2(i.getReadValueId().getNodeId(), v.getValue());
});
}).get();
@@ -146,23 +154,54 @@
* @CreateTime 2023骞�10鏈�13鏃�
*/
- public void handle(NodeId id, Variant value){
- String className = "cn.stylefeng.guns.opcua.cert.MethodName";
- String methodName = "a";
+ /*public void handle(NodeId id, Variant value){
+ long startTime = System.currentTimeMillis();
+
+ OpcuaConfParam opcuaConfParam=new OpcuaConfParam();
+ opcuaConfParam.setNode(id.getIdentifier().toString());
+ List<OpcuaConfResult> a=opcuaConfController.mylist(opcuaConfParam);
+ log.info("鏁版嵁搴撹闂唬鐮佹墽琛屾椂闂达細" + (System.currentTimeMillis() - startTime) + "姣");
String str1 = id.getIdentifier().toString()+":"+value.getValue().toString();
try {
- Class<?> clazz = Class.forName(className);
- Method method = clazz.getMethod(methodName, String.class);
+ Class<?> clazz = Class.forName(a.get(0).getRModule());
+ Method method = clazz.getMethod(a.get(0).getRFunction(), String.class);
method.invoke(clazz.newInstance(), str1);
} catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InstantiationException |
InvocationTargetException e) {
e.printStackTrace();
}
- //if(id.getIdentifier().toString().equals("my.device.x1")){
- // log.info("item={}, value={},{}", id.getIdentifier().toString(), value,"杩斿洖涓�涓猄N鍙�");
- //}
+ log.info("浠ｇ爜鎵ц鏃堕棿锛�" + (System.currentTimeMillis() - startTime) + "姣");
+ }*/
+ public void handle2(NodeId id, Variant value){
+
+ MicroTimestamp t = null;
+ String sTime=t.INSTANCE.get();
+
+
+ if (b == null || 0 > b.size()) {
+ OpcuaConfParam opcuaConfParam=new OpcuaConfParam();
+ opcuaConfParam.setSubscribe(1);
+ b=opcuaConfController.mylist(opcuaConfParam);
+ }
+ //浣跨敤Stream API鍦↙ist<T>涓煡鎵惧厓绱�
+ OpcuaConfResult opcuaConfResult = b.stream()
+ .filter(customer ->id.getIdentifier().toString().equals(customer.getNode()))
+ .findAny()
+ .orElse(null);
+ try {
+ Class<?> clazz = Class.forName(opcuaConfResult.getRModule());
+ Method method = clazz.getMethod(opcuaConfResult.getRFunction(), new Class[] { String.class,
+ String.class });
+ method.invoke(clazz.newInstance(),new Object[] {
+ new String(id.getIdentifier().toString()), new String(value.getValue().toString()) });
+ } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InstantiationException |
+ InvocationTargetException e) {
+ e.printStackTrace();
+ }
+ log.info("浠ｇ爜鎵ц寮�濮嬫椂闂翠负锛�"+ sTime +",缁撴潫鏃堕棿涓猴細"+t.INSTANCE.get()+".");
}
+
/**
* @MethodName: write
@@ -186,6 +225,9 @@
case "boolean":
value = new Variant(Boolean.parseBoolean(node.getValue().toString()));
break;
+ case "long":
+ value = new Variant(Long.parseLong(node.getValue().toString()));
+ break;
}
DataValue dataValue = new DataValue(value, null, null);
--
Gitblit v1.9.3