From 465d5c4666546e7e54f0e3c34c7bcce5830aaa6a Mon Sep 17 00:00:00 2001
From: yantian yue <306727702@qq.com>
Date: 星期三, 18 十月 2023 09:20:37 +0800
Subject: [PATCH] OPCUA增加查询条件
---
guns-vip-main/src/main/java/cn/stylefeng/guns/opcua/mapper/mapping/OpcuaConfMapper.xml | 12 ++++++++++++
guns-vip-main/src/main/webapp/assets/modular/bs/opcuaConf/opcuaConf.js | 3 ++-
guns-vip-main/src/main/webapp/pages/modular/bs/opcuaConf/opcuaConf.html | 8 +++++++-
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/opcua/mapper/mapping/OpcuaConfMapper.xml b/guns-vip-main/src/main/java/cn/stylefeng/guns/opcua/mapper/mapping/OpcuaConfMapper.xml
index 7643377..e6ac109 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/opcua/mapper/mapping/OpcuaConfMapper.xml
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/opcua/mapper/mapping/OpcuaConfMapper.xml
@@ -26,24 +26,36 @@
select
<include refid="Base_Column_List"/>
from sys_opcua_conf where 1 = 1
+ <if test="paramCondition.node != null and paramCondition.node != ''">
+ and node like CONCAT('%',#{paramCondition.node},'%')
+ </if>
</select>
<select id="customMapList" resultType="map" parameterType="cn.stylefeng.guns.opcua.model.params.OpcuaConfParam">
select
<include refid="Base_Column_List"/>
from sys_opcua_conf where 1 = 1
+ <if test="paramCondition.node != null and paramCondition.node != ''">
+ and node like CONCAT('%',#{paramCondition.node},'%')
+ </if>
</select>
<select id="customPageList" resultType="cn.stylefeng.guns.opcua.model.result.OpcuaConfResult" parameterType="cn.stylefeng.guns.opcua.model.params.OpcuaConfParam">
select
<include refid="Base_Column_List"/>
from sys_opcua_conf where 1 = 1
+ <if test="paramCondition.node != null and paramCondition.node != ''">
+ and node like CONCAT('%',#{paramCondition.node},'%')
+ </if>
</select>
<select id="customPageMapList" resultType="map" parameterType="cn.stylefeng.guns.opcua.model.params.OpcuaConfParam">
select
<include refid="Base_Column_List"/>
from sys_opcua_conf where 1 = 1
+ <if test="paramCondition.node != null and paramCondition.node != ''">
+ and node like CONCAT('%',#{paramCondition.node},'%')
+ </if>
</select>
</mapper>
diff --git a/guns-vip-main/src/main/webapp/assets/modular/bs/opcuaConf/opcuaConf.js b/guns-vip-main/src/main/webapp/assets/modular/bs/opcuaConf/opcuaConf.js
index 61fd8f2..0c7c943 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/bs/opcuaConf/opcuaConf.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/bs/opcuaConf/opcuaConf.js
@@ -6,7 +6,7 @@
var func = layui.func;
/**
- * 绠＄悊
+ * OPCUA閰嶇疆绠＄悊
*/
var OpcuaConf = {
tableId: "opcuaConfTable"
@@ -38,6 +38,7 @@
OpcuaConf.search = function () {
var queryData = {};
+ queryData['node'] = $('#node').val();
table.reload(OpcuaConf.tableId, {
where: queryData, page: {curr: 1}
diff --git a/guns-vip-main/src/main/webapp/pages/modular/bs/opcuaConf/opcuaConf.html b/guns-vip-main/src/main/webapp/pages/modular/bs/opcuaConf/opcuaConf.html
index 56eba99..f8db3bd 100644
--- a/guns-vip-main/src/main/webapp/pages/modular/bs/opcuaConf/opcuaConf.html
+++ b/guns-vip-main/src/main/webapp/pages/modular/bs/opcuaConf/opcuaConf.html
@@ -1,7 +1,7 @@
@layout("/common/_container.html",{js:["/assets/modular/bs/opcuaConf/opcuaConf.js"]}){
<div class="layui-body-header">
- <span class="layui-body-header-title">绠＄悊</span>
+ <span class="layui-body-header-title">OPCUA閰嶇疆</span>
</div>
<div class="layui-fluid">
@@ -12,6 +12,12 @@
<div class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
+ 鑺傜偣:
+ </div>
+ <div class="layui-inline">
+ <input id="node" class="layui-input" type="text" placeholder="鑺傜偣"/>
+ </div>
+ <div class="layui-inline">
<button id="btnSearch" class="layui-btn icon-btn"><i class="layui-icon"></i>鎼滅储</button>
<button id="btnAdd" class="layui-btn icon-btn"><i class="layui-icon"></i>娣诲姞</button>
<button id="btnExp" class="layui-btn icon-btn"><i class="layui-icon"></i>瀵煎嚭</button>
--
Gitblit v1.9.3