NVR添加搜索

liujun001
1 parent b4830a3a
Showing 3 changed files with 15 additions and 4 deletions
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
web_src/src/components/DeviceList.vue
@@ -165,7 +165,7 @@ public interface DeviceMapper {
             "(SELECT count(0) FROM wvp_device_channel WHERE device_id=de.device_id) as channel_count " +
             "FROM wvp_device de" +
             "<if test=\"onLine != null\"> where on_line=${onLine}</if>"+
-            " order by create_time desc "+
+            " order by on_line desc,create_time desc "+
             " </script>"
     )
     List<Device> getDevices(Boolean onLine);
@@ -109,12 +109,13 @@ public class DeviceQuery {
     @Operation(summary = "分页查询国标设备", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "page", description = "当前页", required = true)
     @Parameter(name = "count", description = "每页查询数量", required = true)
+    @Parameter(name = "online", description = "在线状态")
     @GetMapping("/devices")
     @Options()
-    public PageInfo<Device> devices(int page, int count) {
+    public PageInfo<Device> devices(int page, int count,Boolean online) {
 //		if (page == null) page = 0;
 //		if (count == null) count = 20;
-        return storager.queryVideoDeviceList(page, count, null);
+        return storager.queryVideoDeviceList(page, count, online);
     }
  
     /**
@@ -3,6 +3,14 @@
     <div class="page-header">
       <div class="page-title">设备列表</div>
       <div class="page-header-btn">
+        在线状态:
+        <el-select size="mini" style="width: 8rem; margin-right: 1rem;" @change="getDeviceList()" v-model="online" placeholder="请选择"
+                   default-first-option>
+          <el-option label="全部" value=""></el-option>
+          <el-option label="在线" value="true"></el-option>
+          <el-option label="离线" value="false"></el-option>
+        </el-select>
+
         <el-button icon="el-icon-plus" size="mini" style="margin-right: 1rem;" type="primary" @click="add">添加设备
         </el-button>
         <el-button icon="el-icon-refresh-right" circle size="mini" :loading="getDeviceListLoading"
@@ -112,6 +120,7 @@ export default {
       currentDeviceChannelsLenth: 0,
       winHeight: window.innerHeight - 200,
       currentPage: 1,
+      online:'true',
       count: 15,
       total: 0,
       getDeviceListLoading: false,
@@ -157,7 +166,8 @@ export default {
         url: `/api/device/query/devices`,
         params: {
           page: this.currentPage,
-          count: this.count
+          count: this.count,
+          online:this.online
         }
       }).then( (res)=> {
         if (res.data.code === 0) {