fix():添加设备列表搜索，通道搜索

王鑫
1 parent 368716c9
Showing 13 changed files with 155 additions and 38 deletions
src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
src/main/resources/application.yml
web_src/config/index.js
web_src/src/components/DeviceList.vue
web_src/src/components/common/DeviceTree.vue
web_src/src/components/live.vue
web_src/src/components/service/DeviceService.js
@@ -118,12 +118,14 @@ public interface IDeviceService {
  
     /**
      * 树形查询接口
-     * @param deviceId 设备ID
-     * @param parentId 父ID
+     *
+     * @param deviceId    设备ID
+     * @param parentId    父ID
      * @param onlyCatalog 只获取目录
+     * @param onload
      * @return
      */
-    List<BaseTree<DeviceChannel>> queryVideoDeviceTree(String deviceId, String parentId, boolean onlyCatalog);
+    List<BaseTree<DeviceChannel>> queryVideoDeviceTree(String deviceId, String parentId, boolean onlyCatalog, String onload);
  
     /**
      * 查询树节点下的通道
@@ -43,6 +43,7 @@ import java.text.ParseException;
 import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
  
 /**
  * 设备业务（目录订阅）
@@ -427,7 +428,7 @@ public class DeviceServiceImpl implements IDeviceService {
  
  
     @Override
-    public List<BaseTree<DeviceChannel>> queryVideoDeviceTree(String deviceId, String parentId, boolean onlyCatalog) {
+    public List<BaseTree<DeviceChannel>> queryVideoDeviceTree(String deviceId, String parentId, boolean onlyCatalog, String onload) {
         Device device = deviceMapper.getDeviceByDeviceId(deviceId);
         if (device == null) {
             return null;
@@ -435,7 +436,16 @@ public class DeviceServiceImpl implements IDeviceService {
         if (ObjectUtils.isEmpty(parentId) ) {
             parentId = deviceId;
         }
-        List<DeviceChannel> rootNodes = deviceChannelMapper.getSubChannelsByDeviceId(deviceId, parentId, onlyCatalog);
+        List<DeviceChannel> rootNodes = null;
+        if ("the".equals(onload)){
+            rootNodes = deviceChannelMapper.getSubChannelsByDeviceId(deviceId, parentId, onlyCatalog)
+                    .stream().filter(ch -> Objects.equals(ch.getChannelId(), "34020000001310000001")
+                            || Objects.equals(ch.getChannelId(), "34020000001310000002")).collect(Collectors.toList());
+        }else {
+            rootNodes = deviceChannelMapper.getSubChannelsByDeviceId(deviceId, parentId, onlyCatalog);
+        }
+
+
         return transportChannelsToTree(rootNodes, "");
     }
  
@@ -10,17 +10,17 @@ import com.github.pagehelper.PageInfo;
  
 import java.util.List;
  
-/**    
+/**
  * @description:视频设备数据存储接口
  * @author: swwheihei
- * @date:   2020年5月6日 下午2:14:31     
+ * @date:   2020年5月6日 下午2:14:31
  */
 @SuppressWarnings("rawtypes")
 public interface IVideoManagerStorage {
  
-	/**   
+	/**
 	 * 根据设备ID判断设备是否存在
-	 * 
+	 *
 	 * @param deviceId 设备ID
 	 * @return true:存在  false：不存在
 	 */
@@ -40,10 +40,10 @@ public interface IVideoManagerStorage {
 	 * @param channelId 通道ID
 	 */
 	public void stopPlay(String deviceId, String channelId);
-	
-	/**   
+
+	/**
 	 * 获取设备
-	 * 
+	 *
 	 * @param deviceId 设备ID
 	 * @return DShadow 设备对象
 	 */
@@ -58,7 +58,7 @@ public interface IVideoManagerStorage {
 	 * @return
 	 */
 	public PageInfo<DeviceChannel> queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, Boolean catalogUnderDevice, int page, int count);
-	
+
 	public List<DeviceChannelExtend> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, List<String> channelIds, String query, Boolean hasSubChannel, Boolean online, int start, int limit);
  
  
@@ -87,11 +87,20 @@ public interface IVideoManagerStorage {
  
 	/**
 	 * 获取多个设备
-	 * @param page 当前页数
-	 * @param count 每页数量
+	 *
+	 * @param page     当前页数
+	 * @param count    每页数量
+	 * @param deviceId
+	 * @return List<Device> 设备对象数组
+	 */
+	public PageInfo<Device> queryVideoDeviceList(int page, int count, Boolean online, String deviceId);/**
+	 * 获取多个设备
+	 *
+	 * @param page     当前页数
+	 * @param count    每页数量
 	 * @return List<Device> 设备对象数组
 	 */
-	public PageInfo<Device> queryVideoDeviceList(int page, int count,Boolean online);
+	public PageInfo<Device> queryVideoDeviceList(int page, int count, Boolean online);
  
 	/**
 	 * 获取多个设备
@@ -540,8 +540,8 @@ public interface DeviceChannelMapper {
             "from wvp_device_channel " +
             "where device_id=#{deviceId}" +
             " <if test='parentId != null and parentId != deviceId'> and parent_id = #{parentId} </if>" +
-            " <if test='parentId == null or parentId == deviceId'> and parent_id is null or parent_id = #{deviceId}</if>" +
-            " <if test='onlyCatalog == true '> and parental = 1 </if>" +
+            " <if test='parentId == null or parentId == deviceId'> and (parent_id is null or parent_id = #{deviceId} ) </if>" +
+            " <if test='onlyCatalog == true '> and parental = 1  </if>" +
             " </script>"})
     List<DeviceChannel> getSubChannelsByDeviceId(@Param("deviceId") String deviceId, @Param("parentId") String parentId, @Param("onlyCatalog") boolean onlyCatalog);
  
@@ -550,4 +550,6 @@ public interface DeviceChannelMapper {
             " <if test='channelId != null'> and channel_id = #{channelId} </if>" +
             "</script>")
     void updateChannelStreamIdentification(DeviceChannel channel);
+
+
 }
@@ -170,6 +170,49 @@ public interface DeviceMapper {
     )
     List<Device> getDevices(Boolean onLine);
  
+    @Select(
+            " <script>" +
+            "SELECT " +
+            "device_id, " +
+            "coalesce(custom_name, name) as name, " +
+            "password, " +
+            "manufacturer, " +
+            "model, " +
+            "firmware, " +
+            "transport," +
+            "stream_mode," +
+            "ip,"+
+            "sdp_ip,"+
+            "local_ip,"+
+            "port,"+
+            "host_address,"+
+            "expires,"+
+            "register_time,"+
+            "keepalive_time,"+
+            "create_time,"+
+            "update_time,"+
+            "charset,"+
+            "subscribe_cycle_for_catalog,"+
+            "subscribe_cycle_for_mobile_position,"+
+            "mobile_position_submission_interval,"+
+            "subscribe_cycle_for_alarm,"+
+            "ssrc_check,"+
+            "as_message_channel,"+
+            "broadcast_push_after_ack,"+
+            "geo_coord_sys,"+
+            "on_line,"+
+            "media_server_id,"+
+            "(SELECT count(0) FROM wvp_device_channel WHERE device_id=de.device_id) as channel_count " +
+            "FROM wvp_device de" +
+            "<where>" +
+            " <if test=\"onLine != null\"> AND on_line=${onLine}</if>"+
+            " <if test=\"deviceId != null and deviceId != ''\"> AND coalesce(custom_name, name) like CONCAT('%',#{deviceId},'%')</if>" +
+            "</where>"+
+            " order by on_line desc,create_time desc "+
+            " </script>"
+    )
+    List<Device> getDevicesByDeviceId(@Param("onLine") Boolean onLine, @Param("deviceId") String deviceId);
+
     @Delete("DELETE FROM wvp_device WHERE device_id=#{deviceId}")
     int del(String deviceId);
  
@@ -7,7 +7,6 @@ import com.genersoft.iot.vmp.gb28181.bean.*;
 import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
 import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
-import com.genersoft.iot.vmp.service.IGbStreamService;
 import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
@@ -445,12 +444,20 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage {
 	/**
 	 * 获取多个设备
 	 *
-	 * @param page 当前页数
-	 * @param count 每页数量
+	 * @param page     当前页数
+	 * @param count    每页数量
+	 * @param deviceId
 	 * @return PageInfo<Device> 分页设备对象数组
 	 */
 	@Override
-	public PageInfo<Device> queryVideoDeviceList(int page, int count,Boolean online) {
+	public PageInfo<Device> queryVideoDeviceList(int page, int count, Boolean online, String deviceId) {
+		PageHelper.startPage(page, count);
+		List<Device> all = deviceMapper.getDevicesByDeviceId(online,deviceId);
+		return new PageInfo<>(all);
+	}
+
+	@Override
+	public PageInfo<Device> queryVideoDeviceList(int page, int count, Boolean online) {
 		PageHelper.startPage(page, count);
 		List<Device> all = deviceMapper.getDevices(online);
 		return new PageInfo<>(all);
@@ -112,10 +112,10 @@ public class DeviceQuery {
     @Parameter(name = "online", description = "在线状态")
     @GetMapping("/devices")
     @Options()
-    public PageInfo<Device> devices(int page, int count,Boolean online) {
+    public PageInfo<Device> devices(int page, int count,Boolean online,String deviceId) {
 //		if (page == null) page = 0;
 //		if (count == null) count = 20;
-        return storager.queryVideoDeviceList(page, count, online);
+        return storager.queryVideoDeviceList(page, count, online, deviceId);
     }
  
     /**
@@ -541,6 +541,7 @@ public class DeviceQuery {
     public ResponseEntity<PageInfo> getTree(@PathVariable String deviceId,
                                             @RequestParam(required = false) String parentId,
                                             @RequestParam(required = false) Boolean onlyCatalog,
+                                            @RequestParam(required = false) String online,
                                             int page, int count) {
  
  
@@ -551,7 +552,7 @@ public class DeviceQuery {
             onlyCatalog = false;
         }
  
-        List<BaseTree<DeviceChannel>> treeData = deviceService.queryVideoDeviceTree(deviceId, parentId, onlyCatalog);
+        List<BaseTree<DeviceChannel>> treeData = deviceService.queryVideoDeviceTree(deviceId, parentId, onlyCatalog, online);
         if (treeData == null || (page - 1) * count > treeData.size()) {
             PageInfo<BaseTree<DeviceChannel>> pageInfo = new PageInfo<>();
             pageInfo.setPageNum(page);
@@ -2,6 +2,6 @@ spring:
   application:
     name: wvp
   profiles:
-    active: local
+    active: wx-local
 server:
-  port: 18080
 \ No newline at end of file
+  port: 18080
@@ -11,14 +11,14 @@ module.exports = {
     assetsPublicPath: "/",
     proxyTable: {
       "/debug": {
-        target: "http://192.168.20.215:18089",
+        target: "http://127.0.0.1:16000",
         changeOrigin: true,
         pathRewrite: {
           "^/debug": "/",
         },
       },
       "/static/snap": {
-        target: "http://61.169.120.202:18089",
+        target: "http://127.0.0.1:16000",
         changeOrigin: true,
         // pathRewrite: {
         //   '^/static/snap': '/static/snap'
@@ -10,7 +10,8 @@
           <el-option label="在线" value="true"></el-option>
           <el-option label="离线" value="false"></el-option>
         </el-select>
-
+        <el-input size="mini" style="width: 8rem; margin-right: 1rem;" placeholder="请输入名称关键字" v-model="deviceId"></el-input>
+        <el-button icon="el-icon-search" size="mini" style="margin-right: 1rem;" type="primary" @click="getDeviceList()">搜索</el-button>
         <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"
@@ -114,7 +115,7 @@ export default {
     return {
       deviceList: [], //设备列表
       currentDevice: {}, //当前操作设备对象
-
+      deviceId: '',
       videoComponentList: [],
       updateLooper: 0, //数据刷新轮训标志
       currentDeviceChannelsLenth: 0,
@@ -167,7 +168,8 @@ export default {
         params: {
           page: this.currentPage,
           count: this.count,
-          online:this.online
+          online:this.online,
+          deviceId: this.deviceId
         }
       }).then( (res)=> {
         if (res.data.code === 0) {
@@ -3,8 +3,17 @@
     <el-container>
       <el-header>设备列表</el-header>
       <el-main style="background-color: #ffffff;">
+        <el-input v-model="filterText" placeholder="输入关键字进行过滤"
+                  clearable size="small"
+                  prefix-icon="el-icon-search" style="margin-bottom: 5px" />
         <div class="device-tree-main-box">
-          <el-tree ref="gdTree" :props="defaultProps" :load="loadNode" lazy @node-click="handleNodeClick"@node-contextmenu="handleContextMenu" node-key="id" style="min-width: 100%; display:inline-block !important;">
+          <el-tree ref="gdTree"
+                   :props="defaultProps"
+                   :load="loadNode" lazy
+                   :filter-node-method="filterNode"
+                   @node-click="handleNodeClick"
+                   @node-contextmenu="handleContextMenu"
+                   node-key="id" style="min-width: 100%; display:inline-block !important;">
             <span class="custom-tree-node" slot-scope="{ node, data }" style="width: 100%">
               <span v-if="node.data.type === 0 && node.data.online" title="在线设备" class="device-online iconfont icon-jiedianleizhukongzhongxin2"></span>
               <span v-if="node.data.type === 0 && !node.data.online " title="离线设备" class="device-offline iconfont icon-jiedianleizhukongzhongxin2"></span>
@@ -37,6 +46,11 @@ import DeviceService from &quot;../service/DeviceService.js&quot;;
  
 export default {
     name: 'DeviceTree',
+    watch: {
+      filterText(val) {
+        this.$refs.gdTree.filter(val);
+      }
+    },
     data() {
         return {
           deviceService: new DeviceService(),
@@ -44,11 +58,35 @@ export default {
             children: 'children',
             label: 'name',
             isLeaf: 'isLeaf'
-          }
+          },
+          filterText: '',
+          online: 'the'
         };
     },
     props: ['device', 'onlyCatalog', 'clickEvent', 'contextMenuEvent'],
     methods: {
+      /**
+       * 模糊查询树
+       */
+      filterNode(value, data, node) {
+        console.log('查询 ====》',value,node)
+        if (!value) return true;
+        return this.findSearKey(node, value)
+      },
+      /**
+       * 递归搜索父级是否包含关键字
+       */
+      findSearKey(node, key) {
+        if (node.label.toLowerCase().indexOf(key) !== -1 || node.label.toUpperCase().indexOf(key) !== -1) {
+          return true;
+        } else {
+          if (node.parent.parent == null) {
+            return false;
+          } else {
+            return this.findSearKey(node.parent, key);
+          }
+        }
+      },
       handleNodeClick(data,node,element) {
         let deviceNode = this.$refs.gdTree.getNode(data.userData.deviceId)
         if(typeof (this.clickEvent) == "function") {
@@ -104,9 +142,8 @@ export default {
           }
         }else {
           let channelArray = []
-
+          console.log("online ===> ", this.online)
           this.deviceService.getTree(node.data.userData.deviceId, node.data.id, this.onlyCatalog, catalogData =>{
-            console.log(catalogData)
             channelArray = channelArray.concat(catalogData)
             this.channelDataHandler(channelArray, resolve)
           },(endCatalogData) => {
@@ -149,10 +149,13 @@ export default {
         } else {
           that.$message.error(res.data.msg);
         }
+        that.loading = false
       }).catch(function (e) {
+        that.loading = false
       }).finally(() => {
         that.loading = false
       });
+
     },
     setPlayUrl(url, idx) {
       this.$set(this.videoUrl, idx, url)
@@ -134,7 +134,7 @@ class DeviceService{
     }).catch(errorCallback);
   }
  
-  getTree(deviceId, parentId, onlyCatalog, callback, endCallback, errorCallback) {
+  getTree(deviceId, parentId, onlyCatalog, callback, endCallback, errorCallback ) {
     let currentPage = 1;
     let count = 100;
     let catalogList = []
@@ -166,7 +166,8 @@ class DeviceService{
         page: currentPage,
         count: count,
         parentId: parentId,
-        onlyCatalog: onlyCatalog
+        onlyCatalog: onlyCatalog,
+        online: 'the'
       }
     }).then((res) =>{
       if (typeof (callback) == "function") callback(res.data)