diff --git a/README.md b/README.md
index e0a5646..36dbb79 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ ruoyi-wvp是基于ruoyi-vue和wvp框架的全部开源的GB/T 28181-2016标准
## 内置功能
1. 原若依全部功能：原若依全部功能,包含用户管理、角色管理、部门管理及系统监控等。
-2. 国标设备：国标设备完成注册后,平台自动展示设备详情,支持查看设备通道、云台控制及便捷点播视频等多样化功能。
+2. 国标设备：国标设备完成注册后,平台自动展示设备详情,支持查看设备通道及便捷点播视频等多样化功能。
3. 云端录像：用户可轻松查看或下载国标设备所存储的云端录像视频内容。
4. 推流列表：清晰呈现推流及可推流设备通道信息,支持一键播放视频与便捷国标通道配置等操作。
5. 拉流列表：清晰呈现拉流及可拉流设备通道信息,支持一键播放视频与便捷国标通道配置等操作。
@@ -36,22 +36,12 @@ ruoyi-wvp是基于ruoyi-vue和wvp框架的全部开源的GB/T 28181-2016标准
9. 通道管理：与行政分组和业务分组深度关联,实现通道精细化和高效化管理,形成多维度的管理逻辑。
10. 节点管理：实时查看ZLMediaKit节点的状态、负载及资源分配详情。
11. 分屏监控：支持4/6/9分屏自由切换，实时掌控多区域画面，提升安防巡查效率。
-12. 设备录像：支持点播设备录像和下载功能。
-## 非开源功能-onvif协议
+## 非开源功能
1. onvif设备发现：内网环境下可一键扫描并查看所有开启ONVIF协议的设备信息，实现高效集中管控。
2. onvif设备嗅探：通过IP地址与账号密码自动探测设备，快速获取设备信息并启用实时直播功能。
3. onvif设备管理：实现参数配置及实时视频点播，简化多品牌设备管控。
-4. onvif云台功能：实现绝对位置移动和连续移动。
-
-## 非开源功能-ISUP协议
-
-1. 设备管理、视频点播、云台控制。
-
-## 非开源功能-rtsp协议
-
-1. 设备管理、视频点播。
## 前端源码
@@ -82,15 +72,7 @@ ruoyi-wvp是基于ruoyi-vue和wvp框架的全部开源的GB/T 28181-2016标准
 |
-  |
-
-
-  |
-  |
-
-
-  |
-  |
+  |
 |
@@ -119,22 +101,7 @@ ruoyi-wvp是基于ruoyi-vue和wvp框架的全部开源的GB/T 28181-2016标准
 |
-  |
-
-
-
-## isup播放示例图
-
-
-  |
-
-
-
-## rtsp播放示例图
-
-
-
-  |
+  |
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
index c8c49c9..8fd6540 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
@@ -24,7 +24,7 @@ import com.ruoyi.system.domain.SysCache;
/**
* 缓存监控
- *
+ *
* @author ruoyi
*/
@RestController
@@ -43,6 +43,7 @@ public class CacheController
caches.add(new SysCache(CacheConstants.REPEAT_SUBMIT_KEY, "防重提交"));
caches.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "限流处理"));
caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "密码错误次数"));
+ caches.add(new SysCache(CacheConstants.SYS_WORK_LIST, "工作台数据"));
}
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java
index 0080343..fc86051 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java
@@ -2,7 +2,7 @@ package com.ruoyi.common.constant;
/**
* 缓存的key 常量
- *
+ *
* @author ruoyi
*/
public class CacheConstants
@@ -41,4 +41,9 @@ public class CacheConstants
* 登录账户密码错误次数 redis key
*/
public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
+
+ /**
+ * 工作台数据 redis key
+ */
+ public static final String SYS_WORK_LIST = "sys_work_list:";
}
diff --git a/ruoyi-isup/pom.xml b/ruoyi-isup/pom.xml
index 0a0b182..e999d6b 100644
--- a/ruoyi-isup/pom.xml
+++ b/ruoyi-isup/pom.xml
@@ -21,4 +21,14 @@
UTF-8
+
+
+
+
+ com.ruoyi
+ ruoyi-common
+
+
+
+
diff --git a/ruoyi-onvif/pom.xml b/ruoyi-onvif/pom.xml
index d5fba99..580d790 100644
--- a/ruoyi-onvif/pom.xml
+++ b/ruoyi-onvif/pom.xml
@@ -17,4 +17,13 @@
UTF-8
+
+
+
+
+ com.ruoyi
+ ruoyi-common
+
+
+
diff --git a/ruoyi-rtsp/pom.xml b/ruoyi-rtsp/pom.xml
index 77431ca..ab332e6 100644
--- a/ruoyi-rtsp/pom.xml
+++ b/ruoyi-rtsp/pom.xml
@@ -17,4 +17,14 @@
UTF-8
+
+
+
+ com.ruoyi
+ ruoyi-common
+
+
+
+
+
diff --git a/ruoyi-wvp/libs/jdbc-aarch/kingbase8-8.6.0.jre7.jar b/ruoyi-wvp/libs/jdbc-aarch/kingbase8-8.6.0.jre7.jar
deleted file mode 100644
index 28102eb..0000000
Binary files a/ruoyi-wvp/libs/jdbc-aarch/kingbase8-8.6.0.jre7.jar and /dev/null differ
diff --git a/ruoyi-wvp/libs/jdbc-aarch/postgresql-42.2.9.jar b/ruoyi-wvp/libs/jdbc-aarch/postgresql-42.2.9.jar
deleted file mode 100644
index 62d0b6d..0000000
Binary files a/ruoyi-wvp/libs/jdbc-aarch/postgresql-42.2.9.jar and /dev/null differ
diff --git a/ruoyi-wvp/libs/jdbc-aarch/postgresql-42.2.9.jre7.jar b/ruoyi-wvp/libs/jdbc-aarch/postgresql-42.2.9.jre7.jar
deleted file mode 100644
index f6077b6..0000000
Binary files a/ruoyi-wvp/libs/jdbc-aarch/postgresql-42.2.9.jre7.jar and /dev/null differ
diff --git a/ruoyi-wvp/libs/jdbc-x86/bcprov-jdk15on-1.70.jar b/ruoyi-wvp/libs/jdbc-x86/bcprov-jdk15on-1.70.jar
deleted file mode 100644
index 0e4198e..0000000
Binary files a/ruoyi-wvp/libs/jdbc-x86/bcprov-jdk15on-1.70.jar and /dev/null differ
diff --git a/ruoyi-wvp/libs/jdbc-x86/kingbase8-8.6.0.jre6.jar b/ruoyi-wvp/libs/jdbc-x86/kingbase8-8.6.0.jre6.jar
deleted file mode 100644
index fcdf628..0000000
Binary files a/ruoyi-wvp/libs/jdbc-x86/kingbase8-8.6.0.jre6.jar and /dev/null differ
diff --git a/ruoyi-wvp/libs/jdbc-x86/kingbase8-8.6.0.jre7.jar b/ruoyi-wvp/libs/jdbc-x86/kingbase8-8.6.0.jre7.jar
deleted file mode 100644
index a039358..0000000
Binary files a/ruoyi-wvp/libs/jdbc-x86/kingbase8-8.6.0.jre7.jar and /dev/null differ
diff --git a/ruoyi-wvp/libs/jdbc-x86/postgresql-42.2.9.jar b/ruoyi-wvp/libs/jdbc-x86/postgresql-42.2.9.jar
deleted file mode 100644
index 487cfc1..0000000
Binary files a/ruoyi-wvp/libs/jdbc-x86/postgresql-42.2.9.jar and /dev/null differ
diff --git a/ruoyi-wvp/libs/jdbc-x86/postgresql-42.2.9.jre6.jar b/ruoyi-wvp/libs/jdbc-x86/postgresql-42.2.9.jre6.jar
deleted file mode 100644
index 11e9f99..0000000
Binary files a/ruoyi-wvp/libs/jdbc-x86/postgresql-42.2.9.jre6.jar and /dev/null differ
diff --git a/ruoyi-wvp/libs/jdbc-x86/postgresql-42.2.9.jre7.jar b/ruoyi-wvp/libs/jdbc-x86/postgresql-42.2.9.jre7.jar
deleted file mode 100644
index 522738d..0000000
Binary files a/ruoyi-wvp/libs/jdbc-x86/postgresql-42.2.9.jre7.jar and /dev/null differ
diff --git a/ruoyi-wvp/src/main/java/com/ruoyi/wvp/controller/DeviceQueryController.java b/ruoyi-wvp/src/main/java/com/ruoyi/wvp/controller/DeviceQueryController.java
index ae38bd4..fbe723f 100644
--- a/ruoyi-wvp/src/main/java/com/ruoyi/wvp/controller/DeviceQueryController.java
+++ b/ruoyi-wvp/src/main/java/com/ruoyi/wvp/controller/DeviceQueryController.java
@@ -85,6 +85,19 @@ public class DeviceQueryController extends BaseController {
return success(deviceService.getDeviceByDeviceId(deviceId));
}
+ /**
+ * 查询全部国标设备
+ *
+ * @param device 设备
+ * @return 国标列表
+ */
+ @PreAuthorize("@ss.hasPermi('wvp:device:list')")
+ @GetMapping("/deviceList")
+ public AjaxResult deviceList(Device device) {
+ List list = deviceService.getAll(device);
+ return success(list);
+ }
+
/**
* 分页查询国标设备
*
diff --git a/ruoyi-wvp/src/main/java/com/ruoyi/wvp/controller/GBRecordController.java b/ruoyi-wvp/src/main/java/com/ruoyi/wvp/controller/GBRecordController.java
index a29827a..25d9a72 100644
--- a/ruoyi-wvp/src/main/java/com/ruoyi/wvp/controller/GBRecordController.java
+++ b/ruoyi-wvp/src/main/java/com/ruoyi/wvp/controller/GBRecordController.java
@@ -1,5 +1,7 @@
package com.ruoyi.wvp.controller;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.wvp.common.StreamInfo;
import com.ruoyi.wvp.conf.UserSetting;
import com.ruoyi.wvp.conf.exception.ControllerException;
@@ -39,7 +41,7 @@ import java.util.UUID;
@Slf4j
@RestController
@RequestMapping("/api/gb_record")
-public class GBRecordController {
+public class GBRecordController extends BaseController {
@Autowired
private SIPCommander cmder;
@@ -213,7 +215,7 @@ public class GBRecordController {
@Parameter(name = "channelId", description = "通道国标编号", required = true)
@Parameter(name = "stream", description = "流ID", required = true)
@GetMapping("/download/progress/{deviceId}/{channelId}/{stream}")
- public StreamContent getProgress(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) {
+ public AjaxResult getProgress(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) {
Device device = deviceService.getDeviceByDeviceId(deviceId);
if (device == null) {
log.warn("[获取历史媒体下载进度] 未找到设备 deviceId: {},channelId:{}", deviceId, channelId);
@@ -229,6 +231,6 @@ public class GBRecordController {
if (downLoadInfo == null) {
throw new ControllerException(ErrorCode.ERROR404);
}
- return new StreamContent(downLoadInfo);
+ return success(new StreamContent(downLoadInfo));
}
}
diff --git a/ruoyi-wvp/src/main/java/com/ruoyi/wvp/controller/PlayController.java b/ruoyi-wvp/src/main/java/com/ruoyi/wvp/controller/PlayController.java
index ea0ebda..b2ca3fe 100644
--- a/ruoyi-wvp/src/main/java/com/ruoyi/wvp/controller/PlayController.java
+++ b/ruoyi-wvp/src/main/java/com/ruoyi/wvp/controller/PlayController.java
@@ -262,6 +262,12 @@ public class PlayController extends BaseController {
return jsonObject;
}
+ /**
+ * 创建快照 - 抓拍
+ * @param deviceId
+ * @param channelId
+ * @return
+ */
@Parameter(name = "deviceId", description = "设备国标编号", required = true)
@Parameter(name = "channelId", description = "通道国标编号", required = true)
@GetMapping("/snap")
diff --git a/ruoyi-wvp/src/main/java/com/ruoyi/wvp/controller/WvpServerController.java b/ruoyi-wvp/src/main/java/com/ruoyi/wvp/controller/WvpServerController.java
index 2343a00..74ea900 100644
--- a/ruoyi-wvp/src/main/java/com/ruoyi/wvp/controller/WvpServerController.java
+++ b/ruoyi-wvp/src/main/java/com/ruoyi/wvp/controller/WvpServerController.java
@@ -253,10 +253,10 @@ public class WvpServerController extends BaseController {
@GetMapping(value = "/system/info")
@ResponseBody
- public SystemAllInfo getSystemInfo() {
+ public AjaxResult getSystemInfo() {
SystemAllInfo systemAllInfo = redisCatchStorage.getSystemInfo();
- return systemAllInfo;
+ return success(systemAllInfo);
}
@GetMapping(value = "/media_server/load")
diff --git a/ruoyi-wvp/src/main/java/com/ruoyi/wvp/gb28181/transmit/cmd/impl/SIPCommander.java b/ruoyi-wvp/src/main/java/com/ruoyi/wvp/gb28181/transmit/cmd/impl/SIPCommander.java
index d3cd8d0..21896c2 100644
--- a/ruoyi-wvp/src/main/java/com/ruoyi/wvp/gb28181/transmit/cmd/impl/SIPCommander.java
+++ b/ruoyi-wvp/src/main/java/com/ruoyi/wvp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -424,7 +424,6 @@ public class SIPCommander implements ISIPCommander {
content.append("a=connection:new\r\n");
}
}
-
//ssrc
content.append("y=" + ssrcInfo.getSsrc() + "\r\n");
diff --git a/snap/34020000001320000001_34020000001310000001.jpg b/snap/34020000001320000001_34020000001310000001.jpg
deleted file mode 100644
index b3cf97b..0000000
Binary files a/snap/34020000001320000001_34020000001310000001.jpg and /dev/null differ
diff --git a/snap/34020000001350000001_34020000001310000001.jpg b/snap/34020000001350000001_34020000001310000001.jpg
deleted file mode 100644
index 9a9a849..0000000
Binary files a/snap/34020000001350000001_34020000001310000001.jpg and /dev/null differ
diff --git a/snap/34020000001360000001_34020000001310000001.jpg b/snap/34020000001360000001_34020000001310000001.jpg
deleted file mode 100644
index fdf862b..0000000
Binary files a/snap/34020000001360000001_34020000001310000001.jpg and /dev/null differ
diff --git a/snap/34020000001390000001_34020000001320000001.jpg b/snap/34020000001390000001_34020000001320000001.jpg
deleted file mode 100644
index 158b0a0..0000000
Binary files a/snap/34020000001390000001_34020000001320000001.jpg and /dev/null differ
diff --git a/snap/34020000001400000001_34020000001320000001.jpg b/snap/34020000001400000001_34020000001320000001.jpg
deleted file mode 100644
index b848f93..0000000
Binary files a/snap/34020000001400000001_34020000001320000001.jpg and /dev/null differ
diff --git a/snap/34020000001400000001_34020000001420000001.jpg b/snap/34020000001400000001_34020000001420000001.jpg
deleted file mode 100644
index 90b754c..0000000
Binary files a/snap/34020000001400000001_34020000001420000001.jpg and /dev/null differ
diff --git a/snap/34020000001410000001_34020000001410000001.jpg b/snap/34020000001410000001_34020000001410000001.jpg
deleted file mode 100644
index ea2f52d..0000000
Binary files a/snap/34020000001410000001_34020000001410000001.jpg and /dev/null differ
diff --git a/snap/34020000001410000001_34020000001410000002.jpg b/snap/34020000001410000001_34020000001410000002.jpg
deleted file mode 100644
index 7266f0a..0000000
Binary files a/snap/34020000001410000001_34020000001410000002.jpg and /dev/null differ