From 7ff5e9edadf446d0d033574a7b0ae802f5ac2233 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期六, 17 二月 2024 15:36:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/client/ClientHandler.java |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/client/ClientHandler.java b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/client/ClientHandler.java
index 7ccd646..6267237 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/client/ClientHandler.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/client/ClientHandler.java
@@ -157,7 +157,7 @@
 	public void handle(NodeId id, Variant value){
 		if (b == null || 0 > b.size()) {
 			DaOpcuaConfig opcuaConfParam=new DaOpcuaConfig();
-		    opcuaConfParam.setSubscribe(1L);
+		    opcuaConfParam.setSubscribe("Y");
 		    b=daOpcuaConfigService.selectDaOpcuaConfigList(opcuaConfParam);
 		}
 		//浣跨敤Stream API鍦↙ist<T>涓煡鎵惧厓绱�
@@ -166,7 +166,7 @@
 				.findAny()
 				.orElse(null);
 		try {
-			Class<?> clazz = Class.forName(daOpcuaConfig.getrModule());
+			Class<?> clazz = Class.forName("com.jcdm.main.da.opcuaconfig.cert.MethodName");
 			Method method = clazz.getMethod(daOpcuaConfig.getrFunction(), new Class[] { String.class, String.class });
 			method.invoke(clazz.newInstance(),new Object[] {
 					new String(id.getIdentifier().toString()), new String(value.getValue().toString()) });
@@ -223,16 +223,11 @@
 	/**
 	 * 鏂规硶鎻忚堪: 璇诲彇澶氫釜鐐逛綅鐨勫��
 	 *
-	 * @param keys 鐐逛綅闆嗗悎
+	 * @param nodeIdList 鐐逛綅闆嗗悎
 	 * @return {@link List<DataValue>}
 	 * @throws
 	 */
-	public static List<DataValue> readValues(Set<String> keys){
-		List<NodeId> nodeIdList=new ArrayList<>(500);
-		keys.forEach(e->{
-			NodeId nodeId = new NodeId(2, e);
-			nodeIdList.add(nodeId);
-		});
+	public static List<DataValue> readValues(List<NodeId> nodeIdList){
 		try {
 			List<DataValue> dataValues=client.readValues(0.0, TimestampsToReturn.Both,nodeIdList).get();
 			return dataValues;

--
Gitblit v1.9.3