From a69d63feef10e3d13e91e3647274a889a311db5a Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期一, 19 二月 2024 08:10:23 +0800
Subject: [PATCH] 更新OPCUA
---
jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java | 1 -
jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/client/ClientHandler.java | 14 +++++++++++---
jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java | 2 +-
jcdm-admin/src/main/resources/application-druid.yml | 4 ++++
4 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/jcdm-admin/src/main/resources/application-druid.yml b/jcdm-admin/src/main/resources/application-druid.yml
index 2a15f1f..f3c574e 100644
--- a/jcdm-admin/src/main/resources/application-druid.yml
+++ b/jcdm-admin/src/main/resources/application-druid.yml
@@ -28,6 +28,10 @@
# username: dt
# password: dtroot
# 浠庡簱鏁版嵁婧�
+# master:
+# url: jdbc:sqlserver://183.134.244.158:1433;DataBaseName=Jcdm041-Mes
+# username: sa
+# password: JCDM@2023
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
enabled: false
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 f168d4b..290c19a 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
@@ -42,7 +42,6 @@
case "2": //璇锋眰璁板綍宸ヤ綅鏁版嵁
NodeEntity SN_node= NodeEntity.builder().index(2).identifier(parts[0]+"."+parts[1]+".SNCode").value("").type("").build();
String SNCode=clientHandler.read(SN_node);
- log.info("璇诲彇鑺傜偣:{},缁撴灉:{}", SN_node.getIdentifier(),SNCode);
if(SNCode==null){
NodeEntity node2= NodeEntity.builder().index(2).identifier(parts[0]+"."+parts[1]+".MesRecordDataDone").value("22").type("short").build();
Boolean out2=clientHandler.write(node2);
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 6267237..fc78ab0 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
@@ -168,8 +168,13 @@
try {
Class<?> clazz = Class.forName("com.jcdm.main.da.opcuaconfig.cert.MethodName");
Method method = clazz.getMethod(daOpcuaConfig.getrFunction(), new Class[] { String.class, String.class });
+ if (value.isNull()){
+ method.invoke(clazz.newInstance(),new Object[] {
+ new String(id.getIdentifier().toString()), new String("") });
+ }else{
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();
@@ -257,11 +262,14 @@
log.info("Value={}", value);
Variant variant = value.getValue();
- log.info("Variant={}", variant.getValue());
- log.info("BackingClass={}", BuiltinDataType.getBackingClass(variant.getDataType().get()));
+ if(null == variant.getValue())
+ {
+ return null;
+ }else{
+ return variant.getValue().toString();
+ }
- return variant.getValue().toString();
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java
index 23d2e95..fc65d8f 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java
@@ -111,7 +111,7 @@
@PreAuthorize("@ss.hasPermi('da:opcuaconfig:query')")
@GetMapping(value = "/SNCode/{SNCode}/{locationCode}")
public AjaxResult setSNCode(@PathVariable("SNCode") String SNCode,@PathVariable("locationCode") String locationCode) {
- NodeEntity node= NodeEntity.builder().index(2).identifier("CFL4CVT"+"."+locationCode+".SNCode").value(SNCode).type("string").build();
+ NodeEntity node= NodeEntity.builder().index(2).identifier("CFL4CVT"+"."+locationCode+".MesSNCode").value(SNCode).type("string").build();
Boolean out= null;
try {
out = ClientHandler.write(node);
--
Gitblit v1.9.3