From 4e8a1c02b45f72f6377603778e8c8746ed82f374 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 06 Jan 2026 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdVtduServiceImpl.java | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdVtduServiceImpl.java b/ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdVtduServiceImpl.java
index 0aebb02..806b065 100644
--- a/ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdVtduServiceImpl.java
+++ b/ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdVtduServiceImpl.java
@@ -38,14 +38,6 @@
mediaService.clearAll();
}
- @Scheduled(cron = "0/5 * * * * ?")
- public void syncMediamtx() {
- log.debug("定时同步MediaMTX任务");
- List<String> nameList = mediaService.getNameList();
- List<ArdVtdu> ardVtduList = selectArdVtduList(new ArdVtdu());
- asyncMediaMTX(ardVtduList, nameList);
- }
-
/**
* 查询流媒体管理
*
@@ -76,6 +68,7 @@
*/
@Override
public int insertArdVtdu(ArdVtdu ardVtdu) {
+ ardVtdu.setCreateTime(DateUtils.getNowDate());
ardVtdu = mediaService.addPath(ardVtdu);
return ardVtduMapper.insertArdVtdu(ardVtdu);
}
@@ -88,6 +81,7 @@
*/
@Override
public int updateArdVtdu(ArdVtdu ardVtdu) {
+ ardVtdu.setUpdateTime(DateUtils.getNowDate());
ardVtdu = mediaService.editPath(ardVtdu);
ardVtdu.setUpdateTime(DateUtils.getNowDate());
return ardVtduMapper.updateArdVtdu(ardVtdu);
@@ -205,15 +199,5 @@
diffListToAdd(vtdus, names).forEach(vtdu -> {
mediaService.addPath(vtdu);
});
- }
-
- //匹配rtsp地址
- private String matchRtsp(String value) {
- Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(value);
- if (matcher.find()) {
- return matcher.group();
- } else {
- return "";
- }
}
}
--
Gitblit v1.9.3