ws-opc ua 订阅模式

industry-admin/src/views/source/dataSource/index.vue

@@ -89,13 +89,13 @@
             <el-input v-model.number='dataSourceForm.ipPort' type="text" auto-complete="off" placeholder="请输入端口号"
               oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
           </el-form-item>
-          <el-form-item label='安全模式：' prop="securityMode" required v-if="dataSourceForm.type == 'opc_ua_real'">
+          <el-form-item label='安全模式：' prop="securityMode" required v-if="dataSourceForm.type == 'opc_ua_real' || dataSourceForm.type == 'opc_ua_fast'">
             <el-select v-model="dataSourceForm.securityMode" placeholder="请选择安全模式" style="width: calc(100% - 0px);">
               <el-option v-for="dict in securityMode" :key="dict.value" :label="dict.key"
                 :value="dict.value"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label='安全策略：' prop="securityPolicy" required v-if="dataSourceForm.type == 'opc_ua_real'">
+          <el-form-item label='安全策略：' prop="securityPolicy" required v-if="dataSourceForm.type == 'opc_ua_real' || dataSourceForm.type == 'opc_ua_fast'">
             <el-select v-model="dataSourceForm.securityPolicy" placeholder="请选择安全策略" style="width: calc(100% - 0px);">
               <el-option v-for="dict in securityPolicy" :key="dict.value" :label="dict.key"
                 :value="dict.value"></el-option>
@@ -108,12 +108,12 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label='帐号：' prop="ipUserName"
-            v-if="(dataSourceForm.type != 'opc_ua_real' || dataSourceForm.identityProvider == 1) && dataSourceForm.type != 'modbus_real'">
+            v-if="((dataSourceForm.type != 'opc_ua_real'  && dataSourceForm.type != 'opc_ua_fast') || dataSourceForm.identityProvider == 1) && dataSourceForm.type != 'modbus_real'">
             <el-input v-model='dataSourceForm.ipUserName' type="text" auto-complete="off"
               placeholder="请输入帐号"></el-input>
           </el-form-item>
           <el-form-item label='密码：' prop="ipPassword" key="ipPassword"
-            v-if="(dataSourceForm.type != 'opc_ua_real' || dataSourceForm.identityProvider == 1) && dataSourceForm.type != 'modbus_real'">
+            v-if="((dataSourceForm.type != 'opc_ua_real'  && dataSourceForm.type != 'opc_ua_fast') || dataSourceForm.identityProvider == 1) && dataSourceForm.type != 'modbus_real'">
             <el-input v-model='dataSourceForm.ipPassword' clearable type="password" auto-complete="new-password"
               placeholder="请输入密码"></el-input>
           </el-form-item>
@@ -450,7 +450,7 @@ export default {
         this.dataSourceForm.progId = ''
         this.dataSourceForm.driverDescribe = ''
       }
-      if (this.dataSourceForm.type === 'opc_ua_real') {
+      if (this.dataSourceForm.type === 'opc_ua_real' || this.dataSourceForm.type === 'opc_ua_fast') {
         this.dataSourceForm.securityMode = 1
         this.dataSourceForm.securityPolicy = 'http://opcfoundation.org/UA/SecurityPolicy#None'
         this.dataSourceForm.identityProvider = 0

industry-system/industry-da/src/main/java/com/example/opc_da/validate/dataSource/DataSourceValidateFactory.java

@@ -17,6 +17,7 @@ public class DataSourceValidateFactory {
         dataSourceValidateMap.put(2, new OpcUaValidate());
         dataSourceValidateMap.put(4, new OpcDaValidate());
         dataSourceValidateMap.put(7, new ModbusValidate());
+        dataSourceValidateMap.put(8, new OpcUaValidate());
     }
 
     public static DataSourceValidate getDataSourceValidate(Integer type) {