From c98ef23b98573d622f6637bb181bfebc8172b118 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 21 十一月 2023 14:30:33 +0800
Subject: [PATCH] 修复定时删除过期录像文件时，收藏文件被删除的问题

---
 src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java |    2 +-
 src/main/java/com/genersoft/iot/vmp/conf/CloudRecordTimer.java                 |    6 +++---
 src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java   |    3 +++
 3 files changed, 7 insertions(+), 4 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 a58fe6d..78272c9 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/CloudRecordTimer.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/CloudRecordTimer.java
@@ -41,8 +41,8 @@
     /**
      * 瀹氭椂鏌ヨ寰呭垹闄ょ殑褰曞儚鏂囦欢
      */
-//    @Scheduled(fixedRate = 5000) //姣忎簲绉掓墽琛屼竴娆★紝鏂逛究娴嬭瘯
-    @Scheduled(cron = "0 0 0 * * ?")   //姣忓ぉ鐨�0鐐规墽琛�
+    @Scheduled(fixedRate = 5000) //姣忎簲绉掓墽琛屼竴娆★紝鏂逛究娴嬭瘯
+//    @Scheduled(cron = "0 0 0 * * ?")   //姣忓ぉ鐨�0鐐规墽琛�
     public void execute(){
         logger.info("[褰曞儚鏂囦欢瀹氭椂娓呯悊] 寮�濮嬫竻鐞嗚繃鏈熷綍鍍忔枃浠�");
         // 鑾峰彇閰嶇疆浜哸ssist鐨勬祦濯掍綋鑺傜偣
@@ -56,7 +56,7 @@
             Calendar lastCalendar = Calendar.getInstance();
             if (mediaServerItem.getRecordDay() > 0) {
                 lastCalendar.setTime(new Date());
-                // 鑾峰彇淇濆瓨鐨勬渶鍚庢埅鑷虫棩鏈燂紝鍥犱负姣忎釜鑺傜偣閮芥湁涓�涓棩鏈燂紝涔熷氨鏄敮鎸佹瘡涓妭鐐硅缃笉鍚岀殑淇濆瓨鏃ユ湡锛�
+                // 鑾峰彇淇濆瓨鐨勬渶鍚庢埅鑷虫棩[鏈燂紝鍥犱负姣忎釜鑺傜偣閮芥湁涓�涓棩鏈燂紝涔熷氨鏄敮鎸佹瘡涓妭鐐硅缃笉鍚岀殑淇濆瓨鏃ユ湡锛�
                 lastCalendar.add(Calendar.DAY_OF_MONTH, -mediaServerItem.getRecordDay());
                 Long lastDate = lastCalendar.getTimeInMillis();
 
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
index eac543a..bb6e3b0 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
@@ -133,6 +133,9 @@
             JSONArray dataArray = jsonObject.getJSONArray("data");
             JSONObject mediaServerConfig = dataArray.getJSONObject(0);
             String ffmpegCmd = mediaServerConfig.getString(param.getFfmpegCmdKey());
+            if (ffmpegCmd == null) {
+                throw new ControllerException(ErrorCode.ERROR100.getCode(), "ffmpeg鎷夋祦浠ｇ悊鏃犳硶鑾峰彇ffmpeg cmd");
+            }
             String schema = getSchemaFromFFmpegCmd(ffmpegCmd);
             if (schema == null) {
                 throw new ControllerException(ErrorCode.ERROR100.getCode(), "ffmpeg鎷夋祦浠ｇ悊鏃犳硶浠巉fmpeg cmd涓幏鍙栧埌杈撳嚭鏍煎紡");
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 594bcee..4616678 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
@@ -91,7 +91,7 @@
     @Select(" <script>" +
             "select *" +
             " from wvp_cloud_record " +
-            " where end_time &lt;= #{endTimeStamp} and media_server_id  = #{mediaServerId} " +
+            " where collect = false and end_time &lt;= #{endTimeStamp} and media_server_id  = #{mediaServerId} " +
             " </script>")
     List<CloudRecordItem> queryRecordListForDelete(@Param("endTimeStamp")Long endTimeStamp, String mediaServerId);
 

--
Gitblit v1.8.0