修改视频回放服务，生成m3u8索引2文件

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/MonitorVideoLogManageController.java

@@ -49,9 +49,28 @@ public class MonitorVideoLogManageController {
		return monitorVideoLogManageService.queryMonitorVideoLogByTime(monitorVideoLogCondition);
	}
	/**
	 * 查询监控视频日志(按时间段)
	 * @param attendanceReport
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryMonitorVideoLogForM3u8")
	public CommonResponse<String> queryMonitorVideoLogByTimeForM3u8(@ModelAttribute AttendanceReport attendanceReport)
			throws Exception {
		MonitorVideoLog monitorVideoLogCondition = new MonitorVideoLog();
		monitorVideoLogCondition.setResourceToolId(attendanceReport.getId());
		monitorVideoLogCondition.setBeginTime(DateUtil.convertDate(attendanceReport.getBeginDay()));
		monitorVideoLogCondition.setEndTime(DateUtil.convertDate(attendanceReport.getEndDay()));
		return monitorVideoLogManageService.queryMonitorVideoLogByTimeForM3u8(monitorVideoLogCondition);
	}
	/**
	 * 查询单个监控视频日志
	 * @param resourceToolId
	 * @param monitorVideoLogId
	 * @return
	 * @throws Exception
	 */

security-protection-service/src/main/java/com/ai/bss/security/protection/model/SecurityProtectionMinioConfig.java

@@ -23,4 +23,6 @@ public class SecurityProtectionMinioConfig {
	
	private String bucketAiImage;
	private String bucketM3U8;
}

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/MonitorVideoLogManageServiceImpl.java

@@ -1,11 +1,17 @@
package com.ai.bss.security.protection.service.impl;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import cn.hutool.core.lang.UUID;
import com.ai.bss.components.minio.service.MinioService;
import com.ai.bss.security.protection.model.SecurityProtectionMinioConfig;
import com.ai.bss.security.protection.service.interfaces.UploadFileService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,11 +31,20 @@ import com.ai.bss.work.safety.service.api.MonitorSceneQuery;
@Service
public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageService {
	public String SPLIT_CHAR  = "_";
	@Autowired
	private MonitorSceneQuery monitorSceneQuery;
	@Autowired
	private MonitorSceneCommand monitorSceneCommand;
	@Autowired
	private MinioService minioService;
	@Autowired
	private UploadFileService uploadFileService;
	@Autowired
	private SecurityProtectionMinioConfig minioConfig;
	@Override
	public CommonResponse<List<EbcMonitorVideoLog>> queryMonitorVideoLogByTime(MonitorVideoLog monitorVideoLogCondition)
@@ -50,6 +65,46 @@ public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageSe
		return CommonResponse.ok(list);
	}
	@Override
	public CommonResponse<String> queryMonitorVideoLogByTimeForM3u8(MonitorVideoLog monitorVideoLogCondition) throws Exception {
		CommonRequest<MonitorVideoLog> request = new CommonRequest<MonitorVideoLog>(monitorVideoLogCondition);
		CommonResponse<List<MonitorVideoLog>> response = monitorSceneQuery.queryMonitorVideoLogByTime(request);
		List<EbcMonitorVideoLog> list = new ArrayList<EbcMonitorVideoLog>();
		if (response == null || CollectionUtils.isEmpty(response.getData())) {
			return CommonResponse.ok(null);
		}
		StringBuffer m3u8Str = new StringBuffer();
		m3u8Str.append("#EXTM3U").append("\n");
		m3u8Str.append("#EXT-X-VERSION:3").append("\n");
		m3u8Str.append("#EXT-X-TARGETDURATION:65").append("\n");
		m3u8Str.append("#EXT-X-MEDIA-SEQUENCE:0").append("\n");
		String bucketName = minioConfig.getBucketM3U8();//"m3u8-index";
		String fileType = ".m3u8";
		String m3u8FileName = bucketName + SPLIT_CHAR + UUID.fastUUID().toString().replace("-", "") + fileType;
		String videoUrl = "";
		for (MonitorVideoLog monitorVideoLog : response.getData()) {
			EbcMonitorVideoLog ebcMonitorVideoLog = getEbcMonitorVideoLog(monitorVideoLog);
			list.add(ebcMonitorVideoLog);
			videoUrl = uploadFileService.getFileUrl(monitorVideoLog.getVideoUrl());// minioService.getObjectUrl(videoFileIdArr[0],ebcMonitorVideoLog.getVideoFileUrl());
			m3u8Str.append("#EXTINF:65,").append("\n");
			m3u8Str.append(videoUrl).append("\n");
		}
		m3u8Str.append("#EXT-X-ENDLIST").append("\n");
		InputStream is = new ByteArrayInputStream(m3u8Str.toString().getBytes());
		minioService.putObject(bucketName,m3u8FileName,is,fileType);
		String m3u8IndexFileUrl = uploadFileService.getFileUrl(m3u8FileName);
		return CommonResponse.ok(m3u8IndexFileUrl);
	}
	@Override
	public CommonResponse<EbcMonitorVideoLog> queryMonitorVideoLogById(Long monitorVideoLogId) throws Exception {
		CommonRequest<Long> request = new CommonRequest<Long>(monitorVideoLogId);

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/WorkOrderManagementServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.abc.exception.BaseException;
import com.ai.bss.components.common.util.JsonUtils;
import com.ai.bss.user.dto.UserDto;
import com.ai.bss.work.attendance.dto.LeaveApprovalDto;
@@ -266,7 +267,13 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
		userDto.setId(employId);
		CommonRequest<UserDto> request = CommonRequest.<UserDto>builder().data(userDto).pageNumber(1).pageSize(1).build();
		CommonResponse<PageBean<UserDto>>  result = userDtoQuery.queryWorkEmployee(request);
		String  employOrgId = result.getData().getData().get(0).getOrgId();
		String employOrgId = "";
		try {
			employOrgId = result.getData().getData().get(0).getOrgId();
		}catch (Exception e){
			log.error("员工不存在");
			new BaseException("员工不存在");
		}
		log.info("输出参数：{}",JSON.toJSONString(result , SerializerFeature.PrettyFormat));

security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/MonitorVideoLogManageService.java

@@ -22,6 +22,9 @@ public interface MonitorVideoLogManageService {
	CommonResponse<List<EbcMonitorVideoLog>> queryMonitorVideoLogByTime(MonitorVideoLog monitorVideoLogCondition)
			throws Exception;
	CommonResponse<String> queryMonitorVideoLogByTimeForM3u8(MonitorVideoLog monitorVideoLogCondition) throws Exception;
	/**
	 * 根据视频日志ID查询监控视频日志
	 * @param monitorVideoLogId

security-protection-service/src/main/java/com/ai/bss/security/protection/utils/DateUtil.java

@@ -540,7 +540,7 @@ public class DateUtil {
	/**
	 * 取得date中的纯日期部分
	 *
	 * @param date需要变动的日期
	 * @param date
	 * @return 变动后的日期
	 */
	public static Date getDateWithoutTime(Date date) {
@@ -652,4 +652,14 @@ public class DateUtil {
		return Integer.parseInt(lastDay);
	}
	public static String getDateTimeString(Date date){
		if (date == null){
			return null;
		}
		SimpleDateFormat simpleDateFormat = new SimpleDateFormat( NORM_DATETIME_PATTERN);
		String dateString = simpleDateFormat.format(date);
		return dateString;
	}
}

security-protection-service/src/main/resources/application.properties

@@ -27,10 +27,10 @@ spring.main.allow-bean-definition-overriding=true
#kafka
#kafka.bootstrap-servers=47.105.160.21:9090
kafka.bootstrap-servers=10.19.90.34:9090
kafka.topic.aitask=topic_ai_task
kafka.topic.aivideo=topic_ai_video
#kafka.topic.aitask=topicTaskTest
#kafka.topic.aivideo=topicVideoTest
#kafka.topic.aitask=topic_ai_task
#kafka.topic.aivideo=topic_ai_video
kafka.topic.aitask=topicTaskTest
kafka.topic.aivideo=topicVideoTest
kafka.producer.batch-size=16785
kafka.producer.retries=1
kafka.producer.buffer-memory=33554432
@@ -65,6 +65,8 @@ spminio.bucketToolImage=tool-image
spminio.bucketAiVideo=ai-video
# \u76d1\u63a7\u89c6\u9891\u622a\u56fe
spminio.bucketAiImage=ai-image
# \u76d1\u63a7\u89c6\u9891\u622a\u56fe
spminio.bucketM3U8=m3u8-index
# CACHE