Merge remote-tracking branch 'origin/master'

src/main/java/com/sooka/sponest/monitor/dahua/domain/DaHuaMp4VO.java

@@ -12,7 +12,7 @@ import org.apache.ibatis.type.Alias;
 @Alias("daHuaMp4VO")
 public class DaHuaMp4VO {
     private String id;
-    private String channelCode;
+    private String channelNum;
     private String alarmCode;
     private String logId;
     private String eventCode;

src/main/java/com/sooka/sponest/monitor/dahua/service/impl/DahuaServiceImpl.java

@@ -824,7 +824,7 @@ public class DahuaServiceImpl extends BaseService implements DahuaService {
         mp4VOList.forEach(mp4VO -> {
             try {
                 // 发送GET请求，获取MP4地址
-                String videoUrl = downloadUrl + VideoUrlFetcher.getVideoUrl(baseUrl, mp4VO.getChannelCode(), mp4VO.getAlarmCode(), token) + "?token=" + token;
+                String videoUrl = downloadUrl + VideoUrlFetcher.getVideoUrl(baseUrl, mp4VO.getChannelNum(), mp4VO.getAlarmCode(), token) + "?token=" + token;
                 // 上传到文件服务器
                 R<SysFile> sysFileR = fileBaseService.upload(convertUrlToMultipartFile(videoUrl));
 
@@ -841,7 +841,7 @@ public class DahuaServiceImpl extends BaseService implements DahuaService {
                     failureIds.add(mp4VO.getId());
                 }
             } catch (Exception e) {
-                log.error("alarmCode={}, channelCode={}, 下载视频失败,{}", mp4VO.getAlarmCode(), mp4VO.getChannelCode(), e.getMessage());
+                log.error("alarmCode={}, channelCode={}, 下载视频失败,{}", mp4VO.getAlarmCode(), mp4VO.getChannelNum(), e.getMessage());
                 saveDownloadResult(mp4VO, null, HttpStatus.ERROR, e.getMessage());
                 failureIds.add(mp4VO.getId());
             }