From f0b395a1b77a4999e89a164fc997f96d9942c3b1 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期四, 25 一月 2024 15:36:29 +0800
Subject: [PATCH] 更新OPCUA
---
jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java | 2 +-
jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/init/OpcusConfigInit.java | 7 +------
jcdm-main/src/main/resources/mapper/da/opcuaconfig/DaOpcuaConfigMapper.xml | 1 +
jcdm-ui/src/views/main/bs/formulaChild/index.vue | 2 +-
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java
index 1fe5a1e..e365959 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java
@@ -25,7 +25,7 @@
private IDaParamCollectionService daParamCollectionService = BeanUtils.getBean(IDaParamCollectionService.class);
private IDaPassingStationCollectionService daPassingStationCollectionService = BeanUtils.getBean(IDaPassingStationCollectionService.class);
private List<DataValue> s=null;
- public void getSn(String Node, String value) throws Exception {
+ public void Transit(String Node, String value) throws Exception {
log.info(Node+":"+value);
String[] parts = Node.split("[.]");
ClientHandler clientHandler=new ClientHandler();
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/init/OpcusConfigInit.java b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/init/OpcusConfigInit.java
index 4bfa496..af8dde3 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/init/OpcusConfigInit.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/init/OpcusConfigInit.java
@@ -2,7 +2,6 @@
import com.google.common.collect.Lists;
import com.jcdm.main.da.opcuaconfig.client.ClientHandler;
-import com.jcdm.main.da.opcuaconfig.controller.DaOpcuaConfigController;
import com.jcdm.main.da.opcuaconfig.domain.DaOpcuaConfig;
import com.jcdm.main.da.opcuaconfig.domain.NodeEntity;
import com.jcdm.main.da.opcuaconfig.service.IDaOpcuaConfigService;
@@ -10,10 +9,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.stereotype.Component;
-
import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
@Component
@Slf4j
@@ -40,9 +36,8 @@
return nodeEntity;
});
clientHandler.subscribe(NodeList);
- log.info("鍒濆鍖朞PC璁㈤槄" + nodeslist.size() + "鏉★紒");
}
- log.info("绯荤粺鎻愮ず锛孫PCUA璁㈤槄鎴愬姛锛�");
+ log.info("OPCUA鍒濆鍖栨垚鍔燂紝骞跺畬鎴�"+ nodeslist.size() +"涓妭鐐硅闃�");
} catch (Exception e) {
e.printStackTrace();
log.info("绯荤粺鎻愮ず锛孫PCUA璁㈤槄澶辫触锛�");
diff --git a/jcdm-main/src/main/resources/mapper/da/opcuaconfig/DaOpcuaConfigMapper.xml b/jcdm-main/src/main/resources/mapper/da/opcuaconfig/DaOpcuaConfigMapper.xml
index 9832bf4..5c86bb8 100644
--- a/jcdm-main/src/main/resources/mapper/da/opcuaconfig/DaOpcuaConfigMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/opcuaconfig/DaOpcuaConfigMapper.xml
@@ -25,6 +25,7 @@
<if test="node != null and node != ''"> and node = #{node}</if>
<if test="rFunction != null and rFunction != ''"> and r_function = #{rFunction}</if>
<if test="process != null and process != ''"> and process = #{process}</if>
+ <if test="subscribe != null and subscribe != ''"> and subscribe = #{subscribe}</if>
<if test="state != null "> and state = #{state}</if>
</where>
</select>
diff --git a/jcdm-ui/src/views/main/bs/formulaChild/index.vue b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
index 078864e..94ecc1b 100644
--- a/jcdm-ui/src/views/main/bs/formulaChild/index.vue
+++ b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
@@ -236,7 +236,7 @@
<el-input v-model="form.processesCode" placeholder="璇疯緭鍏ュ伐搴�" />
</el-form-item>
<el-form-item label="浜у搧缂栧彿" prop="productCode">
- <el-input v-model="form.productCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�" />
+ <el-input v-model="productCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�" />
</el-form-item>
<el-form-item label="鎿嶄綔鍐呭" prop="operationSteps">
<el-input v-model="form.operationSteps" placeholder="璇疯緭鍏ユ搷浣滃唴瀹�" />
--
Gitblit v1.9.3