From d40bc5a034e3cfe73bfd9bea105458deb8871cb2 Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Tue, 15 Jul 2025 18:21:11 +0800
Subject: [PATCH] =?UTF-8?q?[1078]=20=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E5=92=8C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/jt1078/dao/JTTerminalMapper.java  |  6 ++--
 .../iot/vmp/jt1078/proc/request/Re.java       |  1 +
 .../service/impl/jt1078ServiceImpl.java       |  5 ++++
 web/src/api/jtDevice.js                       |  7 +++--
 web/src/views/jtDevice/list.vue               | 29 ++++++++++++++++++-
 5 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTTerminalMapper.java b/src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTTerminalMapper.java
index 321d8e4f7..e7069551c 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTTerminalMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTTerminalMapper.java
@@ -38,9 +38,9 @@ public interface JTTerminalMapper {
             "WHERE " +
             "1=1" +
             " <if test='query != null'> AND (" +
-            "jd.phone_number LIKE concat('%',#{query},'%') " +
-            "jd.terminal_id LIKE concat('%',#{query},'%') " +
-            "jd.province_id LIKE concat('%',#{query},'%') " +
+            "   jd.phone_number LIKE concat('%',#{query},'%') " +
+            "OR jd.terminal_id LIKE concat('%',#{query},'%') " +
+            "OR jd.province_id LIKE concat('%',#{query},'%') " +
             "OR jd.city_id LIKE concat('%',#{query},'%') " +
             "OR jd.maker_id LIKE concat('%',#{query},'%') " +
             "OR jd.model LIKE concat('%',#{query},'%') " +
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java b/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java
index 1609caa64..03a66f497 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java
@@ -28,6 +28,7 @@ public abstract class Re {
             session.register(header.getPhoneNumber(), (int) header.getVersion(), header);
         }
         Rs rs = decode0(buf, header, session);
+        buf.release();
         Rs rsHand = handler(header, session, service);
         if (rs == null && rsHand != null) {
             rs = rsHand;
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java
index 13db1c2fa..278ed82e9 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java
@@ -131,6 +131,11 @@ public class jt1078ServiceImpl implements Ijt1078Service {
     @Override
     public PageInfo<JTDevice> getDeviceList(int page, int count, String query, Boolean online) {
         PageHelper.startPage(page, count);
+        if (query != null) {
+            query = query.replaceAll("/", "//")
+                    .replaceAll("%", "/%")
+                    .replaceAll("_", "/_");
+        }
         List<JTDevice> all = jtDeviceMapper.getDeviceList(query, online);
         return new PageInfo<>(all);
     }
diff --git a/web/src/api/jtDevice.js b/web/src/api/jtDevice.js
index 7f9874217..bbc93b27b 100644
--- a/web/src/api/jtDevice.js
+++ b/web/src/api/jtDevice.js
@@ -2,14 +2,15 @@ import request from '@/utils/request'
 
 // 部标设备API
 
-export function queryDevices(params) {
-  const { page, count } = params
+export function queryDevices({ page, count, query, online }) {
   return request({
     method: 'get',
     url: `/api/jt1078/terminal/list`,
     params: {
       page: page,
-      count: count
+      count: count,
+      query: query,
+      online: online
     }
   })
 }
diff --git a/web/src/views/jtDevice/list.vue b/web/src/views/jtDevice/list.vue
index fe712b8fa..c22a6976c 100755
--- a/web/src/views/jtDevice/list.vue
+++ b/web/src/views/jtDevice/list.vue
@@ -1,6 +1,29 @@
 <template>
   <div id="app" style="height: calc(100vh - 124px);">
     <el-form :inline="true" size="mini">
+      <el-form-item label="搜索">
+        <el-input
+          v-model="searchStr"
+          style="margin-right: 1rem; width: auto;"
+          placeholder="关键字"
+          prefix-icon="el-icon-search"
+          clearable
+          @input="initData"
+        />
+      </el-form-item>
+      <el-form-item label="在线状态">
+        <el-select
+          v-model="online"
+          style="width: 8rem; margin-right: 1rem;"
+          placeholder="请选择"
+          default-first-option
+          @change="initData"
+        >
+          <el-option label="全部" value="" />
+          <el-option label="在线" value="true" />
+          <el-option label="离线" value="false" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button icon="el-icon-plus" size="mini" style="margin-right: 1rem;" type="primary" @click="add">新设备</el-button>
         <el-button icon="el-icon-info" style="margin-right: 1rem;" @click="showInfo()">接入信息</el-button>
@@ -142,6 +165,8 @@ export default {
       deviceList: [], // 设备列表
       updateLooper: 0, // 数据刷新轮训标志
       winHeight: window.innerHeight - 200,
+      searchStr: '',
+      online: '',
       currentPage: 1,
       count: 15,
       total: 0,
@@ -172,7 +197,9 @@ export default {
       this.getListLoading = true
       this.$store.dispatch('jtDevice/queryDevices', {
         page: this.currentPage,
-        count: this.count
+        count: this.count,
+        query: this.searchStr,
+        online: this.online
       })
         .then(data => {
           this.total = data.total