From ddd18928908468ba12c2abb42c267b0d4e49a0d9 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 20 一月 2025 17:15:04 +0800
Subject: [PATCH] 摄像头视频流相关接口
---
src/main/resources/config/application-dev.yml | 23 +----------------------
src/main/resources/config/logback-spring.xml | 4 ++--
src/main/java/com/whyc/schedule/VideoScheduleService.java | 13 +++++++------
3 files changed, 10 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/whyc/schedule/VideoScheduleService.java b/src/main/java/com/whyc/schedule/VideoScheduleService.java
index 450e814..ef85930 100644
--- a/src/main/java/com/whyc/schedule/VideoScheduleService.java
+++ b/src/main/java/com/whyc/schedule/VideoScheduleService.java
@@ -7,6 +7,7 @@
import com.whyc.service.VideoService;
import com.whyc.util.DateUtil;
import com.whyc.util.FileUtil;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
@@ -21,6 +22,7 @@
@EnableScheduling
@Component
+@Slf4j
public class VideoScheduleService {
@Autowired
@@ -41,7 +43,6 @@
List<String> videoStreamIds = YamlProperties.videoStreamIds;
Response4Http streamIdsOnlineRes = service.getVideoStreamIds();
List<String> streamIdsOnline = (List<String>) streamIdsOnlineRes.getData2()==null?new ArrayList<>():(List<String>) streamIdsOnlineRes.getData2();
-
if(streamIdsOnlineRes.getCode() == 1 && ((boolean) streamIdsOnlineRes.getData())){
videoStreamIds.forEach(streamId->{
if(!streamIdsOnline.contains(streamId)){ //娴佷笉瀛樺湪
@@ -50,9 +51,9 @@
Response4Http response2 = service.startRecord(streamId);
if(!(response2.getCode() ==1 && ((boolean) response2.getData()))){
- System.out.println("娴乮d涓�:"+streamId+"鐨勪俊鎭�:"+response2.getMsg());
+ log.info("娴乮d涓�:"+streamId+"鐨勪俊鎭�:"+response2.getMsg());
}else{
- System.out.println("娴乮d涓�:"+streamId+"鐨勪俊鎭�:"+response2.getData());
+ log.error("娴乮d涓�:"+streamId+"鐨勪俊鎭�:"+response2.getData());
}
}else{ //娴佸瓨鍦�
//妫�鏌ユ槸鍚﹀湪褰曞埗鐘舵��
@@ -60,9 +61,9 @@
if(!(boolean)recordingRes.getData()){ //涓嶅湪褰曞埗,鍒欒繘琛屽綍鍒�
Response4Http response2 = service.startRecord(streamId);
if(!(response2.getCode() ==1 && ((boolean) response2.getData()))){
- System.out.println("娴乮d涓�:"+streamId+"鐨勪俊鎭�:"+response2.getMsg());
+ log.error("娴乮d涓�:"+streamId+"鐨勪俊鎭�:"+response2.getMsg());
}else{
- System.out.println("娴乮d涓�:"+streamId+"鐨勪俊鎭�:"+response2.getData());
+ log.info("娴乮d涓�:"+streamId+"鐨勪俊鎭�:"+response2.getData());
}
}
}
@@ -74,7 +75,7 @@
/**
* 褰曞儚淇濇寔3澶�
*/
- @Scheduled(cron= "0 0 3 * * ?")
+ @Scheduled(cron= "0 0 2 * * ?")
public void recordRecycle(){
System.out.println("-----------鎵ц褰曞儚寰幆----------:"+ DateUtil.YYYY_MM_DD_HH_MM_SS.format(new Date()));
//鏂囦欢澶硅矾寰� /battery_system/video_system/Debug/www/record/rtp/{streamId}/{day}}
diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml
index 65c9954..c7a2ac4 100644
--- a/src/main/resources/config/application-dev.yml
+++ b/src/main/resources/config/application-dev.yml
@@ -96,25 +96,4 @@
#瑙嗛娴佺殑id
video:
streamIds:
- "34020000001110000001_34020000001320000001,
- 34020000001110000001_34020000001320000002,
- 34020000001110000001_34020000001320000003,
- 34020000001110000002_34020000001320000001,
- 34020000001110000002_34020000001320000002,
- 34020000001110000002_34020000001320000003,
- 34020000001320000001_34020000001320000001,
- 34020000001320000001_34020000001320000002,
- 34020000001320000002_34020000001320000001,
- 34020000001320000002_34020000001320000002,
- 34020000001320000003_34020000001320000001,
- 34020000001320000003_34020000001320000002,
- 34020000001320000004_34020000001320000001,
- 34020000001320000004_34020000001320000002,
- 34020000001320000005_34020000001320000001,
- 34020000001320000005_34020000001320000002,
- 34020000001320000006_34020000001320000001,
- 34020000001320000006_34020000001320000002,
- 34020000001320000007_34020000001320000001,
- 34020000001320000007_34020000001320000002,
- 34020000001320000008_34020000001320000001,
- 34020000001320000008_34020000001320000002"
\ No newline at end of file
+ "34020000001320000001_34020000001320000002"
\ No newline at end of file
diff --git a/src/main/resources/config/logback-spring.xml b/src/main/resources/config/logback-spring.xml
index c5ce21a..276221f 100644
--- a/src/main/resources/config/logback-spring.xml
+++ b/src/main/resources/config/logback-spring.xml
@@ -8,12 +8,12 @@
<!-- 瀹氫箟鏂囦欢杈撳嚭 -->
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>web_logs\fg.log</file>
+ <file>web_logs/fg.log</file>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>web_logs\fg-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <fileNamePattern>web_logs/fg-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>30</maxHistory>
</rollingPolicy>
--
Gitblit v1.9.1