From ffc8a530f30ba5d200dc885aef7404c5cbab282e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 24 十一月 2023 10:47:33 +0800
Subject: [PATCH] 修复定时录像删除
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 4 ++--
src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java | 2 +-
src/main/resources/all-application.yml | 2 +-
src/main/java/com/genersoft/iot/vmp/conf/CloudRecordTimer.java | 7 +++----
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/CloudRecordTimer.java b/src/main/java/com/genersoft/iot/vmp/conf/CloudRecordTimer.java
index 111077b..89f16cb 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/CloudRecordTimer.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/CloudRecordTimer.java
@@ -41,12 +41,12 @@
/**
* 瀹氭椂鏌ヨ寰呭垹闄ょ殑褰曞儚鏂囦欢
*/
-// @Scheduled(fixedRate = 5000) //姣忎簲绉掓墽琛屼竴娆★紝鏂逛究娴嬭瘯
+// @Scheduled(fixedRate = 10000) //姣忎簲绉掓墽琛屼竴娆★紝鏂逛究娴嬭瘯
@Scheduled(cron = "0 0 0 * * ?") //姣忓ぉ鐨�0鐐规墽琛�
public void execute(){
logger.info("[褰曞儚鏂囦欢瀹氭椂娓呯悊] 寮�濮嬫竻鐞嗚繃鏈熷綍鍍忔枃浠�");
// 鑾峰彇閰嶇疆浜哸ssist鐨勬祦濯掍綋鑺傜偣
- List<MediaServerItem> mediaServerItemList = mediaServerService.getAllWithAssistPort();
+ List<MediaServerItem> mediaServerItemList = mediaServerService.getAllOnline();
if (mediaServerItemList.isEmpty()) {
return;
}
@@ -70,8 +70,7 @@
String date = new File(cloudRecordItem.getFilePath()).getParentFile().getName();
JSONObject jsonObject = zlmresTfulUtils.deleteRecordDirectory(mediaServerItem, cloudRecordItem.getApp(),
cloudRecordItem.getStream(), date, cloudRecordItem.getFileName());
- if (jsonObject.getInteger("code") == 0) {
- }else {
+ if (jsonObject.getInteger("code") != 0) {
logger.warn("[褰曞儚鏂囦欢瀹氭椂娓呯悊] 鍒犻櫎纾佺洏鏂囦欢閿欒锛� {}:{}", cloudRecordItem.getFilePath(), jsonObject);
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
index 3acc795..96f3dfd 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -81,8 +81,8 @@
@Value("${media.record-assist-port:0}")
private Integer recordAssistPort = 0;
- @Value("${media.record-date:7}")
- private Integer recordDay = 7;
+ @Value("${media.record-day:7}")
+ private Integer recordDay;
@Value("${media.record-path}")
private String recordPath;
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
index 4616678..d51f3f9 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
@@ -101,7 +101,7 @@
int changeCollectById(@Param("collect") boolean collect, @Param("recordId") Integer recordId);
@Delete(" <script>" +
- "delete from wvp_cloud_record where media_server_id=#{mediaServerId} and id in " +
+ "delete from wvp_cloud_record where id in " +
" <foreach collection='cloudRecordItemIdList' item='item' open='(' separator=',' close=')' > #{item.id}</foreach>" +
" </script>")
int deleteList(List<CloudRecordItem> cloudRecordItemIdList);
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 6a07514..f5c9d63 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -155,7 +155,7 @@
# 褰曞儚璺緞
record-path: ./www/record
# 褰曞儚淇濆瓨鏃堕暱
- record-date: 7
+ record-day: 7
# 鍚敤澶氱鍙ｆā寮�, 澶氱鍙ｆā寮忎娇鐢ㄧ鍙ｅ尯鍒嗘瘡璺祦锛屽吋瀹规�ф洿濂姐�� 鍗曠鍙ｄ娇鐢ㄦ祦鐨剆src鍖哄垎锛� 鐐规挱瓒呮椂寤鸿浣跨敤澶氱鍙ｆ祴璇�
rtp:
# [鍙�塢 鏄惁鍚敤澶氱鍙ｆā寮�, 寮�鍚悗浼氬湪portRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�
--
Gitblit v1.8.0