修改视频回放

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/service/impl/KafkaProcessImpl.java

@@ -116,19 +116,21 @@ public class KafkaProcessImpl implements KafkaProcess {
				filePath.length());
		if (fileType.equals(MonitorManageConsts.FILE_TYPE_IMG)) {
			bucketName = minioConfig.getBucketAiImage();
			time = fileName.substring(3, 17);
			//dateTime = DateUtils.formatDate(DateUtils.convertDate(time, DateUtils.PURE_DATETIMEHHMM_PATTERN),
			//fileName:img202101121630016.png、img202101121630017.png、img202101121630018.png
			//time = fileName.substring(3, 17);
			//dateTime = DateUtils.formatDate(DateUtils.convertDate(time, DateUtils.PURE_DATETIME_PATTERN),
			//		DateUtils.NORM_DATETIME_PATTERN);
			// aiIdenLogDto.setTaskExecuteTime(DateUtils.getSysDateTime());
			dateTime = DateUtils.formatDate(DateUtils.convertDate(time, DateUtils.PURE_DATETIME_PATTERN),
			time = fileName.substring(3, 15);
			dateTime = DateUtils.formatDate(DateUtils.convertDate(time, DateUtils.PURE_DATETIMEHHMM_PATTERN),
					DateUtils.NORM_DATETIME_PATTERN);
			aiIdenLogDto.setTaskExecuteTime(StringUtils.isEmpty(dateTime) ? DateUtils.getSysDateTime() : dateTime);
			// aiIdenLogDto.setTaskExecuteTime(StringUtils.isEmpty(dateTime) ? DateUtils.getSysDateTime() : dateTime);
			aiIdenLogDto.setTaskExecuteTime(DateUtils.getSysDateTime());
			aiIdenLogDto.setIdenPictureSnapDate(dateTime);
		}
		// 文件上传到 minio文件服务器
		multipartFile = new CommonsMultipartFile(FileUtils.createFileItem(new File(filePath), fileName));
		log.info("保存图片文件");
		log.info("保存图片文件："+fileName);
		minioFileMap = fileManageService.uploadFile(multipartFile, bucketName, deviceCode, null);
		if (fileType.equals(MonitorManageConsts.FILE_TYPE_IMG)) {
@@ -431,7 +433,7 @@ public class KafkaProcessImpl implements KafkaProcess {
			}
			resourceToolInfoList = JSON.parseArray(resultData.getString("data"), Map.class);
			log.info("getResourceToolAllInfo method return result: " + resultData.getString("data"));
			log.debug("getResourceToolAllInfo method return result: " + resultData.getString("data"));
		} catch (Exception e) {
			log.error("getResourceToolAllInfo is error");
		}

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

@@ -75,7 +75,7 @@ public class InAndOutRecordController {
	}
	
	/**
	 * 首页查询进出记录
	 * 查询首页进出记录
	 * @return
	 * @throws Exception
	 */

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

@@ -49,7 +49,6 @@ public class MonitorVideoLogManageController {
		return monitorVideoLogManageService.queryMonitorVideoLogByTime(monitorVideoLogCondition);
	}
	/**
	 * 查询监控视频日志(按时间段)
	 * @param attendanceReport
@@ -76,7 +75,7 @@ public class MonitorVideoLogManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryOneMonitorVideoLog")
	public CommonResponse<EbcMonitorVideoLog> queryOneMonitorVideoLog(@RequestParam String monitorVideoLogId)
	public CommonResponse<String> queryOneMonitorVideoLog(@RequestParam String monitorVideoLogId)
			throws Exception {
		if (StringUtils.isEmpty(monitorVideoLogId)) {
			return CommonResponse.fail("500", "操作失败");
@@ -94,7 +93,7 @@ public class MonitorVideoLogManageController {
	 */
	@ResponseBody
	@RequestMapping("/getMonitorVideoLogByPictureTime")
	public CommonResponse<List<EbcMonitorVideoLog>> getMonitorVideoLogByPictureTime(@RequestParam String imageTime,@RequestParam String resourceToolId)
	public CommonResponse<String> getMonitorVideoLogByPictureTime(@RequestParam String imageTime,@RequestParam String resourceToolId)
			throws Exception {
		if (StringUtils.isEmpty(imageTime)||StringUtils.isEmpty(resourceToolId)) {
			return CommonResponse.fail("500", "获取视频失败");

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

@@ -164,17 +164,19 @@ public class AiAlarmManageServiceImpl implements AiAlarmManageService {
		Map<String, String> pictureMap= uploadFileService.getFileUrlToMap(workTaskSafetyAlarmMap.get("idenPictureUrl"));
		
		//视频信息
		List<EbcMonitorVideoLog> logsList=monitorVideoLogManageService.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), workTaskSafetyAlarmMap.get("resourceToolId")).getData();
		/*List<EbcMonitorVideoLog> logsList=monitorVideoLogManageService.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), workTaskSafetyAlarmMap.get("resourceToolId")).getData();
		EbcMonitorVideoLog ebcMonitorVideoLog=null;
		if (!CollectionUtils.isEmpty(logsList)) {
			ebcMonitorVideoLog=logsList.get(0);
			ebcMonitorVideoLog.setVideoFileUrl(uploadFileService.getFileUrl(ebcMonitorVideoLog.getVideoUrl()));
		}
		}*/
		String videoFileUrl =monitorVideoLogManageService.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), workTaskSafetyAlarmMap.get("resourceToolId")).getData();
		
		Map<String,Object> resultMap= new HashMap<String, Object>();
		resultMap.put("alarmInfo", workTaskSafetyAlarmMap);
		resultMap.put("pictureInfo", pictureMap);
		resultMap.put("videoInfo", ebcMonitorVideoLog);
		//resultMap.put("videoInfo", ebcMonitorVideoLog);
		resultMap.put("videoInfo", videoFileUrl);
		return CommonResponse.ok(resultMap);
	}

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

@@ -252,19 +252,23 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
		Map<String, String> pictureMap = uploadFileService.getFileUrlToMap(aiIdenLog.getIdenPictureUrl());
		// 视频信息
		List<EbcMonitorVideoLog> logsList = monitorVideoLogManageService
		/*List<EbcMonitorVideoLog> logsList = monitorVideoLogManageService
				.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), aiIdenLog.getResourceToolId())
				.getData();
		EbcMonitorVideoLog ebcMonitorVideoLog = null;
		if (!CollectionUtils.isEmpty(logsList)) {
			ebcMonitorVideoLog = logsList.get(0);
			ebcMonitorVideoLog.setVideoFileUrl(uploadFileService.getFileUrl(ebcMonitorVideoLog.getVideoUrl()));
		}
		}*/
		String videoFileUrl =monitorVideoLogManageService
				.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), aiIdenLog.getResourceToolId())
				.getData();
		Map<String, Object> resultMap = new HashMap<String, Object>();
		resultMap.put("alarmInfo", aiIdenLogInfoMap);
		resultMap.put("pictureInfo", pictureMap);
		resultMap.put("videoInfo", ebcMonitorVideoLog);
		//resultMap.put("videoInfo", ebcMonitorVideoLog);
		resultMap.put("videoInfo", videoFileUrl);
		return CommonResponse.ok(resultMap);
	}

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

@@ -46,6 +46,7 @@ public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageSe
	private SecurityProtectionMinioConfig minioConfig;
	@Override
	@Deprecated
	public CommonResponse<List<EbcMonitorVideoLog>> queryMonitorVideoLogByTime(MonitorVideoLog monitorVideoLogCondition)
			throws Exception {
		CommonRequest<MonitorVideoLog> request = new CommonRequest<MonitorVideoLog>(monitorVideoLogCondition);
@@ -103,38 +104,46 @@ public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageSe
	}
	@Override
	public CommonResponse<EbcMonitorVideoLog> queryMonitorVideoLogById(Long monitorVideoLogId) throws Exception {
	public CommonResponse<String> queryMonitorVideoLogById(Long monitorVideoLogId) throws Exception {
		CommonRequest<Long> request = new CommonRequest<Long>(monitorVideoLogId);
		CommonResponse<MonitorVideoLog> response = monitorSceneQuery.loadMonitorVideoLog(request);
		if (response == null || response.getData() == null) {
			return CommonResponse.fail("504", "监控视频不存在");
		}
		EbcMonitorVideoLog ebcMonitorVideoLog = getEbcMonitorVideoLog(response.getData());
		return CommonResponse.ok(ebcMonitorVideoLog);
		
		//EbcMonitorVideoLog ebcMonitorVideoLog = getEbcMonitorVideoLog(response.getData());
		//return CommonResponse.ok(ebcMonitorVideoLog);
		return queryMonitorVideoLogByTimeForM3u8(response.getData());
	}
	@Override
	public CommonResponse<List<EbcMonitorVideoLog>> getMonitorVideoLogByPictureTime(String imageTime,
	public CommonResponse<String> getMonitorVideoLogByPictureTime(String imageTime,
			String resourceToolId) throws Exception {
		Map<String, Object> conditionMap = new HashMap<String, Object>();
		MonitorVideoLog monitorVideoLogCondition = new MonitorVideoLog();
		monitorVideoLogCondition.setResourceToolId(resourceToolId);
		monitorVideoLogCondition.setBeginTime(DateUtil.convertDate(imageTime));
		monitorVideoLogCondition.setEndTime(DateUtil.convertDate(imageTime));
		
		return queryMonitorVideoLogByTimeForM3u8(monitorVideoLogCondition);
		
		
		/*Map<String, Object> conditionMap = new HashMap<String, Object>();
		conditionMap.put("resourceToolId", resourceToolId);
		conditionMap.put("imageTime", imageTime);
		CommonRequest<Map<String, Object>> conditionMapRequest = new CommonRequest<Map<String, Object>>(conditionMap);
		CommonResponse<List<MonitorVideoLog>> response = monitorSceneQuery.selectMonitorVideoLog(conditionMapRequest);
		List<EbcMonitorVideoLog> list = new ArrayList<EbcMonitorVideoLog>();
		
		if (response == null || CollectionUtils.isEmpty(response.getData())) {
			return CommonResponse.ok(list);
			return CommonResponse.ok("");
		}
		
		for (MonitorVideoLog monitorVideoLog : response.getData()) {
			EbcMonitorVideoLog ebcMonitorVideoLog = getEbcMonitorVideoLog(monitorVideoLog);
			list.add(ebcMonitorVideoLog);
		}
		return CommonResponse.ok(list);
		
		return CommonResponse.ok(list);*/
	}
	/**

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

@@ -45,7 +45,7 @@ public interface AiIdenLogManageService {
	CommonResponse<Map<String, Object>> queryOneAiIdenLog(Long aiIdenLogId) throws Exception;
	/**
	 * 查询所有设备最后一个识别记录
	 * 根据场景ID查询最后一条进出记录
	 * @param params
	 * @return
	 * @throws Exception

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

@@ -19,10 +19,16 @@ public interface MonitorVideoLogManageService {
	 * @return
	 * @throws Exception
	 */
	@Deprecated
	CommonResponse<List<EbcMonitorVideoLog>> queryMonitorVideoLogByTime(MonitorVideoLog monitorVideoLogCondition)
			throws Exception;
	/**
	 * 按时间段查询监控视频日志
	 * @param monitorVideoLogCondition
	 * @return
	 * @throws Exception
	 */
	CommonResponse<String> queryMonitorVideoLogByTimeForM3u8(MonitorVideoLog monitorVideoLogCondition) throws Exception;
	/**
@@ -31,7 +37,7 @@ public interface MonitorVideoLogManageService {
	 * @return
	 * @throws Exception
	 */
	CommonResponse<EbcMonitorVideoLog> queryMonitorVideoLogById(Long monitorVideoLogId) throws Exception;
	CommonResponse<String> queryMonitorVideoLogById(Long monitorVideoLogId) throws Exception;
	/**
	 * 根据设备图片时间查询视频日志
@@ -40,7 +46,7 @@ public interface MonitorVideoLogManageService {
	 * @return
	 * @throws Exception
	 */
	CommonResponse<List<EbcMonitorVideoLog>> getMonitorVideoLogByPictureTime(String imageTime,String resourceToolId) throws Exception;
	CommonResponse<String> getMonitorVideoLogByPictureTime(String imageTime,String resourceToolId) throws Exception;
	
	/**
	 * 创建监控视频日志