feat: 增加闵行设备

guzijian
1 parent af16fee7
Showing 13 changed files with 723 additions and 60 deletions
README.md
src/main/java/com/genersoft/iot/vmp/utils/redis/RedisTool.java
src/main/java/com/genersoft/iot/vmp/vehicle/controller/VehicleController.java
src/main/java/com/genersoft/iot/vmp/vehicle/pojo/response/VehicleNvrDeviceRes.java
src/main/java/com/genersoft/iot/vmp/vehicle/pojo/vo/VehicleVo.java
src/main/java/com/genersoft/iot/vmp/vehicle/service/VehicleDeviceService.java
src/main/java/com/genersoft/iot/vmp/vehicle/service/impl/VehicleDeviceServiceImpl.java
web_src/config/index.js
web_src/package-lock.json
web_src/package.json
web_src/src/layout/UiHeader.vue
web_src/src/router/index.js
web_src/static/js/config.js
 ![logo](doc/_media/logo.png)
-# 开箱即用的28181协议视频平台
-
-[![Build Status](https://travis-ci.org/xia-chu/ZLMediaKit.svg?branch=master)](https://travis-ci.org/xia-chu/ZLMediaKit)
-[![license](http://img.shields.io/badge/license-MIT-green.svg)](https://github.com/xia-chu/ZLMediaKit/blob/master/LICENSE)
-[![JAVA](https://img.shields.io/badge/language-java-red.svg)](https://en.cppreference.com/)
-[![platform](https://img.shields.io/badge/platform-linux%20|%20macos%20|%20windows-blue.svg)](https://github.com/xia-chu/ZLMediaKit)
-[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-yellow.svg)](https://github.com/xia-chu/ZLMediaKit/pulls)
-
 WEB VIDEO PLATFORM是一个基于GB28181-2016标准实现的开箱即用的网络视频平台，负责实现核心信令与设备管理后台部分，支持NAT穿透，支持海康、大华、宇视等品牌的IPC、NVR接入。支持国标级联，支持将不带国标功能的摄像机/直播流/直播推流转发到其他国标平台。   
@@ -27,22 +19,9 @@ wvp使用文档 [https://doc.wvp-pro.cn](https://doc.wvp-pro.cn)
 ZLM使用文档 [https://github.com/ZLMediaKit/ZLMediaKit](https://github.com/ZLMediaKit/ZLMediaKit)
 > wvp文档由gitee提供服务，如果遇到打不开请多刷新几次。
-# 付费社群
-[![社群](doc/_media/shequ.png "shequ")](https://t.zsxq.com/0d8VAD3Dm)
-> 收费是为了提供更好的服务，也是对作者更大的激励。加入星球的用户三天后可以私信我留下微信号，我会拉大家入群。加入三天内不满意可以直接退款，大家不需要有顾虑，来白嫖三天也不是不可以。
-
 # gitee同步仓库
 https://gitee.com/pan648540858/wvp-GB28181-pro.git
-# 截图
-![index](doc/_media/index.png "index.png")
-![2](doc/_media/2.png "2.png")
-![3](doc/_media/3.png "3.png")
-![3-1](doc/_media/3-1.png "3-1.png")
-![3-2](doc/_media/3-2.png "3-2.png")
-![3-3](doc/_media/3-3.png "3-3.png")
-![build_1](https://images.gitee.com/uploads/images/2022/0304/101919_ee5b8c79_1018729.png "2022-03-04_10-13.png")
-
 # 功能特性 
 - [X] 集成web界面
 - [X] 兼容性良好
@@ -110,20 +89,10 @@ https://gitee.com/pan648540858/wvp-GB28181-pro.git
 - [X] 支持Mysql，Postgresql，金仓等数据库
 - [X] 支持Onvif(目前在onvif分支，需要安装onvif服务，服务请在知识星球获取)
-# 非开源的内容
-- [X] ONVIF设备的接入，支持点播，云台控制，国标级联点播，自动点播。在[知识星球](https://t.zsxq.com/10WAnH2MP)放了试用安装包以及使用教程，没有使用时间限制，需要源码可以星球私信我或者邮箱联系。
-- [X] 支持国标28181-2022协议，支持巡航轨迹查询，PTZ精准控制，存储卡格式化，设备软件升级，OSD配置，h265+aac，支持辅码流，录像倒放等。具体的功能列表可在[知识星球](https://t.zsxq.com/18GXkpkqs)查看，需要源码和测试可以在星球私信联系或者发邮件给我
-
 # 授权协议
 本项目自有代码使用宽松的MIT协议，在保留版权信息的情况下可以自由应用于各自商用、非商业的项目。 但是本项目也零碎的使用了一些其他的开源代码，在商用的情况下请自行替代或剔除； 由于使用本项目而产生的商业纠纷或侵权行为一概与本项目及开发者无关，请自行承担法律风险。 在使用本项目代码时，也应该在授权协议中同时表明本项目依赖的第三方库的协议
-# 技术支持  
-
-[知识星球](https://t.zsxq.com/0d8VAD3Dm)专栏列表：，
-- [使用入门系列一：WVP-PRO能做什么](https://t.zsxq.com/0dLguVoSp)
-
-有偿技术支持，请发送邮件到648540858@qq.com
 # 致谢
 感谢作者[夏楚](https://github.com/xia-chu) 提供这么棒的开源流媒体服务框架,并在开发过程中给予支持与帮助。     
@@ -136,12 +105,3 @@ https://gitee.com/pan648540858/wvp-GB28181-pro.git
 [ydpd](https://github.com/ydpd) [szy833](https://github.com/szy833) [ydwxb](https://github.com/ydwxb) [Albertzhu666](https://github.com/Albertzhu666)
 [mk1990](https://github.com/mk1990) [SaltFish001](https://github.com/SaltFish001)
-
-ffmpeg -re -i 123.mp3 -acodec pcm_alaw -ar 8000 -ac 1  -f rtsp rtsp://192.168.1.3:30554/broadcast/34020000001320000101_34020000001310000001
-
-ffmpeg -re -i 123.mp3 -acodec pcm_alaw -ar 8000 -ac 1  -f rtsp rtsp://192.168.1.3:30554/talk/34020000001320000011_34020000001370000001
-
-
-
-ffmpeg -re -i 123.mp3 -acodec pcm_alaw -ar 8000 -ac 1  -f rtsp rtsp://192.168.1.3:30554/talk/34020000001320000101_34020000001310000001
-
+package com.genersoft.iot.vmp.utils.redis;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.BoundSetOperations;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.stereotype.Component;
+
+/**
+ * spring redis 工具类
+ *
+ * @author ruoyi
+ **/
+@SuppressWarnings(value = {"unchecked", "rawtypes"})
+@Component
+public class RedisTool {
+    @Autowired
+    public RedisTemplate redisTemplate;
+
+    /**
+     * 缓存基本的对象，Integer、String、实体类等
+     *
+     * @param key   缓存的键值
+     * @param value 缓存的值
+     */
+    public <T> void setCacheObject(final String key, final T value) {
+        redisTemplate.opsForValue().set(key, value);
+    }
+
+    /**
+     * 缓存基本的对象，Integer、String、实体类等
+     *
+     * @param key      缓存的键值
+     * @param value    缓存的值
+     * @param timeout  时间
+     * @param timeUnit 时间颗粒度
+     */
+    public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit) {
+        redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
+    }
+
+    public <T> void setCacheObject(final String key, final T value, final Long timeout, final TimeUnit timeUnit) {
+        redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
+    }
+
+    /**
+     * 设置有效时间
+     *
+     * @param key     Redis键
+     * @param timeout 超时时间
+     * @return true=设置成功；false=设置失败
+     */
+    public boolean expire(final String key, final long timeout) {
+        return expire(key, timeout, TimeUnit.SECONDS);
+    }
+
+    /**
+     * 设置有效时间
+     *
+     * @param key     Redis键
+     * @param timeout 超时时间
+     * @param unit    时间单位
+     * @return true=设置成功；false=设置失败
+     */
+    public boolean expire(final String key, final long timeout, final TimeUnit unit) {
+        return redisTemplate.expire(key, timeout, unit);
+    }
+
+    /**
+     * 设置有效时间
+     *
+     * @param key     Redis键
+     * @param timeout 超时时间
+     * @param unit    时间单位
+     * @return true=设置成功；false=设置失败
+     */
+    public void expire(final String key,Object val ,final long timeout, final TimeUnit unit) {
+        redisTemplate.opsForValue().set(key, val,timeout, unit);
+    }
+
+
+    /**
+     * 获取有效时间
+     *
+     * @param key Redis键
+     * @return 有效时间
+     */
+    public long getExpire(final String key) {
+        return redisTemplate.getExpire(key);
+    }
+
+    /**
+     * 判断 key是否存在
+     *
+     * @param key 键
+     * @return true 存在 false不存在
+     */
+    public Boolean hasKey(String key) {
+        return redisTemplate.hasKey(key);
+    }
+
+    /**
+     * 获得缓存的基本对象。
+     *
+     * @param key 缓存键值
+     * @return 缓存键值对应的数据
+     */
+    public <T> T getCacheObject(final String key) {
+        ValueOperations<String, T> operation = redisTemplate.opsForValue();
+        return operation.get(key);
+    }
+
+    /**
+     * 删除单个对象
+     *
+     * @param key
+     */
+    public boolean deleteObject(final String key) {
+        return redisTemplate.delete(key);
+    }
+
+    /**
+     * 删除集合对象
+     *
+     * @param collection 多个对象
+     * @return
+     */
+    public boolean deleteObject(final Collection collection) {
+        return redisTemplate.delete(collection) > 0;
+    }
+
+    /**
+     * 缓存List数据
+     *
+     * @param key      缓存的键值
+     * @param dataList 待缓存的List数据
+     * @return 缓存的对象
+     */
+    public <T> long setCacheList(final String key, final List<T> dataList) {
+        Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
+        return count == null ? 0 : count;
+    }
+
+    /**
+     * 获得缓存的list对象
+     *
+     * @param key 缓存的键值
+     * @return 缓存键值对应的数据
+     */
+    public <T> List<T> getCacheList(final String key) {
+        return redisTemplate.opsForList().range(key, 0, -1);
+    }
+
+    /**
+     * 缓存Set
+     *
+     * @param key     缓存键值
+     * @param dataSet 缓存的数据
+     * @return 缓存数据的对象
+     */
+    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet) {
+        BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
+        Iterator<T> it = dataSet.iterator();
+        while (it.hasNext()) {
+            setOperation.add(it.next());
+        }
+        return setOperation;
+    }
+
+    /**
+     * 获得缓存的set
+     *
+     * @param key
+     * @return
+     */
+    public <T> Set<T> getCacheSet(final String key) {
+        return redisTemplate.opsForSet().members(key);
+    }
+
+    /**
+     * 缓存Map
+     *
+     * @param key
+     * @param dataMap
+     */
+    public <T> void setCacheMap(final String key, final Map<String, T> dataMap) {
+        if (dataMap != null) {
+            redisTemplate.opsForHash().putAll(key, dataMap);
+        }
+    }
+
+    /**
+     * 缓存map并设置key
+     *
+     * @param key
+     * @param dataMap
+     * @param timeOut
+     * @param timeUnit
+     * @param <T>
+     */
+    public <T> void setCacheMap(final String key, final Map<String, T> dataMap, long timeOut, TimeUnit timeUnit) {
+        if (dataMap != null) {
+            redisTemplate.opsForHash().putAll(key, dataMap);
+            redisTemplate.expire(key, timeOut, timeUnit);
+        }
+    }
+
+    /**
+     * 获得缓存的Map
+     *
+     * @param key
+     * @return
+     */
+    public <T> Map<String, T> getCacheMap(final String key) {
+        return redisTemplate.opsForHash().entries(key);
+    }
+
+    /**
+     * 往Hash中存入数据
+     *
+     * @param key   Redis键
+     * @param hKey  Hash键
+     * @param value 值
+     */
+    public <T> void setCacheMapValue(final String key, final String hKey, final T value) {
+        redisTemplate.opsForHash().put(key, hKey, value);
+    }
+
+    /**
+     * 往Hash中存入数据 并设置过期时间
+     *
+     * @param key   Redis键
+     * @param hKey  Hash键
+     * @param value 值
+     */
+    public <T> void setCacheMapValue(final String key, final String hKey, final T value, long timeOut, TimeUnit timeUnit) {
+        redisTemplate.opsForHash().put(key, hKey, value);
+        redisTemplate.expire(key, timeOut, timeUnit);
+    }
+
+    /**
+     * 获取Hash中的数据
+     *
+     * @param key  Redis键
+     * @param hKey Hash键
+     * @return Hash中的对象
+     */
+    public <T> T getCacheMapValue(final String key, final String hKey) {
+        HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
+        return opsForHash.get(key, hKey);
+    }
+
+    /**
+     * 获取多个Hash中的数据
+     *
+     * @param key   Redis键
+     * @param hKeys Hash键集合
+     * @return Hash对象集合
+     */
+    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys) {
+        return redisTemplate.opsForHash().multiGet(key, hKeys);
+    }
+
+    /**
+     * 删除Hash中的某条数据
+     *
+     * @param key  Redis键
+     * @param hKey Hash键
+     * @return 是否成功
+     */
+    public boolean deleteCacheMapValue(final String key, final String hKey) {
+        return redisTemplate.opsForHash().delete(key, hKey) > 0;
+    }
+
+    public Integer setIncrementMapValue(String key, String hkey, Integer value) {
+        return redisTemplate.opsForHash().increment(key, hkey, value.longValue()).intValue();
+    }
+
+    /**
+     * 获得缓存的基本对象列表
+     *
+     * @param pattern 字符串前缀
+     * @return 对象列表
+     */
+    public Collection<String> keys(final String pattern) {
+        return redisTemplate.keys(pattern);
+    }
+
+    public <T> Set<T> getHashKeys(String key) {
+        return redisTemplate.opsForHash().keys(key);
+    }
+
+    public boolean setNx(String key, Object val) {
+        Boolean result = redisTemplate.opsForValue().setIfAbsent(key, val);
+        return result != null && result;
+    }
+
+    public Long increment(String key) {
+        Long increment = redisTemplate.opsForValue().increment(key);
+        return increment;
+    }
+}
+package com.genersoft.iot.vmp.vehicle.controller;
+
+import com.genersoft.iot.vmp.vehicle.pojo.vo.VehicleVo;
+import com.genersoft.iot.vmp.vehicle.service.VehicleDeviceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping("/api/vehicle")
+public class VehicleController {
+
+    @Autowired
+    private VehicleDeviceService vehicleDeviceService;
+
+
+    @GetMapping("/query")
+    public VehicleVo queryVehicleList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize) {
+        return vehicleDeviceService.queryVehicleList(pageNo,pageSize);
+    }
+
+
+    @GetMapping("/onPlay")
+    public String onPlay(@RequestParam("deviceId") String deviceId,@RequestParam("channel")String channel) {
+        return vehicleDeviceService.onPlay(deviceId,channel);
+    }
+
+}
+package com.genersoft.iot.vmp.vehicle.pojo.response;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+
+import java.util.List;
+
+/**
+ * 车载nvr基本信息
+ */
+public class VehicleNvrDeviceRes {
+    private Integer errCode;
+    private List<ResData> data;
+    private List<ResSelect> select2;
+
+
+    public static class ResData {
+        private String zxzt;
+        private String vehicle;
+        private String insideCode;
+        private String deviceId;
+        private String lineId;
+
+        private Boolean oldDevice;
+
+        private String status;
+
+        public Boolean getOldDevice() {
+            return oldDevice;
+        }
+
+        public void setOldDevice(Boolean oldDevice) {
+            this.oldDevice = oldDevice;
+        }
+
+        public String getStatus() {
+            return status;
+        }
+
+        public void setStatus(String status) {
+            this.status = status;
+        }
+
+        @Override
+        public String toString() {
+            return "ResData{" +
+                    "zxzt='" + zxzt + '\'' +
+                    ", vehicle='" + vehicle + '\'' +
+                    ", insideCode='" + insideCode + '\'' +
+                    ", deviceId='" + deviceId + '\'' +
+                    ", lineId='" + lineId + '\'' +
+                    ", oldDevice=" + oldDevice +
+                    ", status='" + status + '\'' +
+                    '}';
+        }
+
+        public String getZxzt() {
+            return zxzt;
+        }
+
+        public void setZxzt(String zxzt) {
+            this.zxzt = zxzt;
+        }
+
+        public String getVehicle() {
+            return vehicle;
+        }
+
+        public void setVehicle(String vehicle) {
+            this.vehicle = vehicle;
+        }
+
+        public String getInsideCode() {
+            return insideCode;
+        }
+
+        public void setInsideCode(String insideCode) {
+            this.insideCode = insideCode;
+        }
+
+        public String getDeviceId() {
+            return deviceId;
+        }
+
+        public void setDeviceId(String deviceId) {
+            this.deviceId = deviceId;
+        }
+
+        public String getLineId() {
+            return lineId;
+        }
+
+        public void setLineId(String lineId) {
+            this.lineId = lineId;
+        }
+    }
+
+    public static class ResSelect {
+        private String text;
+        private String id;
+
+        @Override
+        public String toString() {
+            return "ResSelect{" +
+                    "text='" + text + '\'' +
+                    ", id='" + id + '\'' +
+                    '}';
+        }
+
+        public String getText() {
+            return text;
+        }
+
+        public void setText(String text) {
+            this.text = text;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+    }
+
+    public Integer getErrCode() {
+        return errCode;
+    }
+
+    public void setErrCode(Integer errCode) {
+        this.errCode = errCode;
+    }
+
+    public List<ResData> getData() {
+        return data;
+    }
+
+    public void setData(List<ResData> data) {
+        this.data = data;
+    }
+
+    public List<ResSelect> getSelect2() {
+        return select2;
+    }
+
+    public void setSelect2(List<ResSelect> select2) {
+        this.select2 = select2;
+    }
+
+    @Override
+    public String toString() {
+        return "VehicleNvrDeviceRes{" +
+                "errCode=" + errCode +
+                ", data=" + data +
+                ", select2=" + select2 +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+
+        if (o == null || getClass() != o.getClass()) return false;
+
+        VehicleNvrDeviceRes that = (VehicleNvrDeviceRes) o;
+
+        return new EqualsBuilder().append(getErrCode(), that.getErrCode()).append(getData(), that.getData()).append(getSelect2(), that.getSelect2()).isEquals();
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder(17, 37).append(getErrCode()).append(getData()).append(getSelect2()).toHashCode();
+    }
+}
+package com.genersoft.iot.vmp.vehicle.pojo.vo;
+
+import com.genersoft.iot.vmp.vehicle.pojo.response.VehicleNvrDeviceRes;
+
+import java.util.List;
+
+public class VehicleVo {
+    private Integer total;
+    private List<VehicleNvrDeviceRes.ResData> list;
+
+    @Override
+    public String toString() {
+        return "VehicleVo{" +
+                "total=" + total +
+                ", list=" + list +
+                '}';
+    }
+
+    public Integer getTotal() {
+        return total;
+    }
+
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+
+    public List<VehicleNvrDeviceRes.ResData> getList() {
+        return list;
+    }
+
+    public void setList(List<VehicleNvrDeviceRes.ResData> list) {
+        this.list = list;
+    }
+}
+package com.genersoft.iot.vmp.vehicle.service;
+
+import com.genersoft.iot.vmp.vehicle.pojo.vo.VehicleVo;
+
+import java.util.List;
+
+public interface VehicleDeviceService {
+    VehicleVo queryVehicleList(Integer pageNo, Integer pageSize);
+
+    String onPlay(String deviceId, String channel);
+}
 \ No newline at end of file
+package com.genersoft.iot.vmp.vehicle.service.impl;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.genersoft.iot.vmp.utils.redis.RedisTool;
+import com.genersoft.iot.vmp.vehicle.pojo.response.VehicleNvrDeviceRes;
+import com.genersoft.iot.vmp.vehicle.pojo.vo.VehicleVo;
+import com.genersoft.iot.vmp.vehicle.service.VehicleDeviceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Service
+public class VehicleDeviceServiceImpl implements VehicleDeviceService {
+
+    @Autowired
+    private RedisTool redisTool;
+
+    @Override
+    public VehicleVo queryVehicleList(Integer pageNo, Integer pageSize) {
+        String key = "vehicle";
+        VehicleNvrDeviceRes nvrDeviceRes = redisTool.getCacheObject(key);
+        if (nvrDeviceRes == null) {
+            nvrDeviceRes = getVehicleNvrDeviceRes();
+            redisTool.setCacheObject(key, nvrDeviceRes);
+        }
+        List<VehicleNvrDeviceRes.ResData> list = nvrDeviceRes.getData();
+        int total = list.size();
+        int remainder = total % pageSize;
+        int currentPage = pageNo > 0 ? (pageNo - 1) * pageSize : pageNo * pageSize;
+        // 怕页码超出界限了 超出界限就通过currenPage (3 * 10) > total (25) ? currentPage (20) - (pageSize (10) - remainder (3)) : currentPage
+        int startPage = currentPage > total ? currentPage - (pageSize - remainder) : currentPage;
+        int endPage = Math.min(startPage + pageSize, total);
+        List<VehicleNvrDeviceRes.ResData> resData = list.subList(startPage, endPage);
+        for (VehicleNvrDeviceRes.ResData data : resData) {
+            // 模糊匹配
+            if (data.getInsideCode().contains("离线")) {
+                data.setStatus("离线");
+            } else {
+                data.setStatus("在线");
+            }
+            if (data.getInsideCode().contains("老")) {
+                data.setOldDevice(true);
+            }else {
+                data.setOldDevice(false);
+            }
+        }
+        VehicleVo vo = new VehicleVo();
+        vo.setList(resData);
+        vo.setTotal(total);
+        return vo;
+    }
+
+    @Override
+    public String onPlay(String deviceId, String channel) {
+        String playUrl = getPlayUrl(deviceId, channel);
+        return playUrl;
+    }
+
+    private String getPlayUrl(String deviceId, String channel) {
+        String url = "http://27.115.69.123:9020/transport_server/lssnvr/play/" + deviceId + "/" + channel + "/" + 4 + "?_=" + System.currentTimeMillis();
+        RestTemplate template = new RestTemplate();
+        String str = template.getForObject(url, String.class);
+        JSONObject jsonObject = JSONObject.parseObject(str);
+        JSONObject data = jsonObject.getJSONObject("data");
+        String rtmp = data.getString("rtmp");
+        return rtmp.replace("rtmp://27.115.69.123:1935","http://27.115.69.123:1986") + ".flv";
+    }
+
+
+    private VehicleNvrDeviceRes getVehicleNvrDeviceRes() {
+        String url = "http://27.115.69.123:9020/transport_server/basic/device.do?q=-&zbh=A-09149D+userid=4";
+        RestTemplate template = new RestTemplate();
+        ParameterizedTypeReference<VehicleNvrDeviceRes> reference = new ParameterizedTypeReference<VehicleNvrDeviceRes>() {
+        };
+        ResponseEntity<VehicleNvrDeviceRes> response = template.exchange(url, HttpMethod.GET, null, reference);
+        VehicleNvrDeviceRes deviceRes = response.getBody();
+        return deviceRes;
+    }
+
+
+}
@@ -11,14 +11,14 @@ module.exports = {
     assetsPublicPath: "/",
     proxyTable: {
       "/debug": {
-        target: "https://61.169.120.202:18080",
+        target: "http://61.169.120.202:18089",
         changeOrigin: true,
         pathRewrite: {
           "^/debug": "/",
         },
       },
       "/static/snap": {
-        target: "https://61.169.120.202:18080",
+        target: "http://61.169.120.202:18089",
         changeOrigin: true,
         // pathRewrite: {
         //   '^/static/snap': '/static/snap'
@@ -14,6 +14,7 @@
         "echarts": "^4.9.0",
         "element-ui": "^2.15.6",
         "fingerprintjs2": "^2.1.2",
+        "flv.js": "^1.6.2",
         "moment": "^2.29.1",
         "ol": "^6.14.1",
         "postcss-pxtorem": "^5.1.1",
@@ -4400,6 +4401,11 @@
         "event-emitter": "~0.3.5"
       }
     },
+    "node_modules/es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
     "node_modules/es6-set": {
       "version": "0.1.6",
       "resolved": "https://registry.npmmirror.com/es6-set/-/es6-set-0.1.6.tgz",
@@ -5027,6 +5033,15 @@
         "readable-stream": "^2.3.6"
       }
     },
+    "node_modules/flv.js": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz",
+      "integrity": "sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==",
+      "dependencies": {
+        "es6-promise": "^4.2.8",
+        "webworkify-webpack": "^2.1.5"
+      }
+    },
     "node_modules/follow-redirects": {
       "version": "1.15.6",
       "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.6.tgz",
@@ -14588,6 +14603,11 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/webworkify-webpack": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz",
+      "integrity": "sha512-2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw=="
+    },
     "node_modules/whet.extend": {
       "version": "0.9.9",
       "resolved": "https://registry.npmmirror.com/whet.extend/-/whet.extend-0.9.9.tgz",
@@ -18692,6 +18712,11 @@
         "event-emitter": "~0.3.5"
       }
     },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
     "es6-set": {
       "version": "0.1.6",
       "resolved": "https://registry.npmmirror.com/es6-set/-/es6-set-0.1.6.tgz",
@@ -19206,6 +19231,15 @@
         "readable-stream": "^2.3.6"
       }
     },
+    "flv.js": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz",
+      "integrity": "sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==",
+      "requires": {
+        "es6-promise": "^4.2.8",
+        "webworkify-webpack": "^2.1.5"
+      }
+    },
     "follow-redirects": {
       "version": "1.15.6",
       "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.6.tgz",
@@ -27144,6 +27178,11 @@
       "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true
     },
+    "webworkify-webpack": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz",
+      "integrity": "sha512-2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw=="
+    },
     "whet.extend": {
       "version": "0.9.9",
       "resolved": "https://registry.npmmirror.com/whet.extend/-/whet.extend-0.9.9.tgz",
@@ -16,6 +16,7 @@
     "echarts": "^4.9.0",
     "element-ui": "^2.15.6",
     "fingerprintjs2": "^2.1.2",
+    "flv.js": "^1.6.2",
     "moment": "^2.29.1",
     "ol": "^6.14.1",
     "postcss-pxtorem": "^5.1.1",
@@ -2,7 +2,7 @@
   <div id="UiHeader">
     <el-menu router :default-active="activeIndex" menu-trigger="click" background-color="#001529" text-color="#fff"
-             active-text-color="#1890ff" mode="horizontal">
+      active-text-color="#1890ff" mode="horizontal">
       <el-menu-item index="/console">控制台</el-menu-item>
       <el-menu-item index="/live">分屏监控</el-menu-item>
@@ -13,6 +13,7 @@
       <el-menu-item index="/cloudRecord">云端录像</el-menu-item>
       <el-menu-item index="/mediaServerManger">节点管理</el-menu-item>
       <el-menu-item index="/parentPlatformList/15/1">国标级联</el-menu-item>
+      <el-menu-item index="/minhang/deviceList">闵行设备</el-menu-item>
       <el-menu-item v-if="editUser" index="/userManager">用户管理</el-menu-item>
       <!--            <el-submenu index="/setting">-->
@@ -37,13 +38,13 @@
 </template>
 <script>
-import changePasswordDialog from '../components/dialog/changePassword.vue'
-import userService from '../components/service/UserService'
-import {Notification} from 'element-ui';
+import { Notification } from 'element-ui';
+import changePasswordDialog from '../components/dialog/changePassword.vue';
+import userService from '../components/service/UserService';
 export default {
   name: "UiHeader",
-  components: {Notification, changePasswordDialog},
+  components: { Notification, changePasswordDialog },
   data() {
     return {
       alarmNotify: false,
@@ -2,24 +2,26 @@ import Vue from &#39;vue&#39;
 import VueRouter from 'vue-router'
 import Layout from "../layout/index.vue"
-import console from '../components/console.vue'
+import cloudRecord from '../components/CloudRecord.vue'
+import cloudRecordDetail from '../components/CloudRecordDetail.vue'
 import deviceList from '../components/DeviceList.vue'
-import channelList from '../components/channelList.vue'
 import gbRecordDetail from '../components/GBRecordDetail.vue'
+import login from '../components/Login.vue'
+import mediaServerManger from '../components/MediaServerManger.vue'
+import parentPlatformList from '../components/ParentPlatformList.vue'
 import pushVideoList from '../components/PushVideoList.vue'
 import streamProxyList from '../components/StreamProxyList.vue'
+import userManager from '../components/UserManager.vue'
+import channelList from '../components/channelList.vue'
+import deviceTree from '../components/common/DeviceTree.vue'
+import minhang from '../components/common/minhang.vue'
+import minhangChannel from '../components/common/minhangChannel.vue'
+import console from '../components/console.vue'
+import live from '../components/live.vue'
 import map from '../components/map.vue'
-import login from '../components/Login.vue'
-import parentPlatformList from '../components/ParentPlatformList.vue'
-import cloudRecord from '../components/CloudRecord.vue'
-import cloudRecordDetail from '../components/CloudRecordDetail.vue'
-import mediaServerManger from '../components/MediaServerManger.vue'
-import web from '../components/setting/Web.vue'
-import sip from '../components/setting/Sip.vue'
 import media from '../components/setting/Media.vue'
-import live from '../components/live.vue'
-import deviceTree from '../components/common/DeviceTree.vue'
-import userManager from '../components/UserManager.vue'
+import sip from '../components/setting/Sip.vue'
+import web from '../components/setting/Web.vue'
 import wasmPlayer from '../components/common/jessibuca.vue'
 import rtcPlayer from '../components/dialog/rtcPlayer.vue'
@@ -54,6 +56,16 @@ export default new VueRouter({
           component: deviceList,
         },
         {
+          path: '/minhang/deviceList',
+          name: 'minhang',
+          component: minhang,
+        },
+        {
+          path: '/minhang/deviceList/channel/:deviceId',
+          name: 'minhangChannel',
+          component: minhangChannel,
+        },
+        {
           path: '/pushVideoList',
           component: pushVideoList,
         },
-window.baseUrl = "https://61.169.120.202:18080";
+window.baseUrl = "http://61.169.120.202:18089";
 // map组件全局参数, 注释此内容可以关闭地图功能
 window.mapParam = {