新增报警详情的接口

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

@@ -5,6 +5,7 @@ import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.model.AiQuery;
import com.ai.bss.security.protection.model.AttendanceReport;
import com.ai.bss.security.protection.model.EbcMonitorVideoLog;
import com.ai.bss.security.protection.service.interfaces.AiAlarmManageService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.work.safety.model.AiModel;
@@ -106,6 +107,23 @@ public class AiAlarmManageController {
	}
	
	/**
	 * 查询单个AI告警信息
	 * @param workTaskId
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryOneAiAlarmInfo")
	public CommonResponse<Map<String,Object>> queryOneAiAlarmInfo(@RequestParam String workTaskId)
			throws Exception {
		if (StringUtils.isEmpty(workTaskId)) {
			return CommonResponse.fail("500", "操作失败");
		}
		return aiAlarmManageService.queryOneAiAlarmInfo(workTaskId);
	}
	
	/**
	 * AI任务模型匹配下拉列表
	 *
	 * @return

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

@@ -65,6 +65,24 @@ public class MonitorVideoLogManageController {
		return monitorVideoLogManageService.queryMonitorVideoLogById(Long.valueOf(monitorVideoLogId));
	}
	
	/**
	 * 根据设备图片时间查询视频日志
	 * @param imageTime
	 * @param resourceToolId
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/getMonitorVideoLogByPictureTime")
	public CommonResponse<List<EbcMonitorVideoLog>> getMonitorVideoLogByPictureTime(@RequestParam String imageTime,@RequestParam String resourceToolId)
			throws Exception {
		if (StringUtils.isEmpty(imageTime)||StringUtils.isEmpty(resourceToolId)) {
			return CommonResponse.fail("500", "获取视频失败");
		}
		return monitorVideoLogManageService.getMonitorVideoLogByPictureTime(imageTime,resourceToolId);
	}
	/**
	 * 创建监控视频日志

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

@@ -16,4 +16,7 @@ public class EbcMonitorVideoLog extends MonitorVideoLog {
	
	private String endTimeStr;
	
	private String fileDateTimeStr;
	
	private String videoFileUrl;
}

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

@@ -4,19 +4,25 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.model.EbcMonitorVideoLog;
import com.ai.bss.security.protection.service.interfaces.AiAlarmManageService;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
import com.ai.bss.security.protection.service.interfaces.MonitorVideoLogManageService;
import com.ai.bss.security.protection.service.interfaces.UploadFileService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.user.dto.EmployeeDto;
import com.ai.bss.user.service.api.EmployeeService;
import com.ai.bss.work.safety.model.AiModel;
import com.ai.bss.work.safety.model.WorkTaskSafetyAlarm;
import com.ai.bss.work.safety.service.api.AiTaskQuery;
import com.ai.bss.work.service.api.WorkTaskCommand;
import com.ai.bss.work.task.model.common.WorkTask;
@@ -39,6 +45,11 @@ public class AiAlarmManageServiceImpl implements AiAlarmManageService {
    @Autowired
    EmployeeService employeeService;
    @Autowired
	private UploadFileService uploadFileService;
    
	@Autowired
	private MonitorVideoLogManageService monitorVideoLogManageService;
    @Override
    public CommonResponse<PageBean<Map<String, Object>>> queryPageAiAlarm(Map<String, Object> params, int pageNumber, int pageSize) {
@@ -97,4 +108,60 @@ public class AiAlarmManageServiceImpl implements AiAlarmManageService {
        CommonRequest<Map<String, Object>> request=new CommonRequest<Map<String, Object>>(conditionMap);
        return aiTaskQuery.selectAiTaskDevice(request);
	}
	@Override
	public CommonResponse<Map<String, Object>> queryOneAiAlarmInfo(String workTaskId) throws Exception {
		CommonRequest<String> request = new CommonRequest<String>(workTaskId);
		CommonResponse<WorkTaskSafetyAlarm> response = aiTaskQuery.queryWorkTaskSafetyAlarmById(request);
		
		if (response==null||response.getData()==null) {
			return CommonResponse.fail("504", "获取失败");
		}
		
		WorkTaskSafetyAlarm workTaskSafetyAlarm=response.getData();
		
		List<CharacteristicSpecValue> aiAlarmTypeList = charSpecService.getCharSpecList(EbcConstant.BUSINESS_SPEC_AI_ALARM_TYPE);
		for (CharacteristicSpecValue characteristicSpecValue : aiAlarmTypeList) {
			if (characteristicSpecValue.getCode().equals(workTaskSafetyAlarm.getAlarmTypeCode())) {
				workTaskSafetyAlarm.setAlarmTypeCode(characteristicSpecValue.getValue());
				break;
			}
		}
		List<CharacteristicSpecValue> aiAlarmStatusList = charSpecService.getCharSpecList(EbcConstant.BUSINESS_SPEC_AI_TASK_STATUS);
		for (CharacteristicSpecValue characteristicSpecValue : aiAlarmStatusList) {
			if (characteristicSpecValue.getCode().equals(workTaskSafetyAlarm.getStatus())) {
				workTaskSafetyAlarm.setStatus(characteristicSpecValue.getValue());
				break;
			}
		}
		
		if(StringUtils.isEmpty(workTaskSafetyAlarm.getWorkEmployeeRoleId())){
            long relateEmployeeRoleId = Long.parseLong(workTaskSafetyAlarm.getWorkEmployeeRoleId());
            EmployeeDto employeeDto = new EmployeeDto();
            employeeDto.setId(relateEmployeeRoleId);
            CommonRequest<EmployeeDto> employeeDtoRequest = new CommonRequest<EmployeeDto>(employeeDto);
            CommonResponse<EmployeeDto> employeeDtoResponse = employeeService.queryEmployee(employeeDtoRequest);
            if (employeeDtoResponse==null||employeeDtoResponse.getData()==null) {
            	workTaskSafetyAlarm.setWorkEmployeeRoleName("--");
			}else {
				workTaskSafetyAlarm.setWorkEmployeeRoleName(employeeDtoResponse.getData().getName());
			}
        }
		
		Map<String, String> pictureMap= uploadFileService.getFileUrlToMap(workTaskSafetyAlarm.getIdenPictureUrl());
		
		List<EbcMonitorVideoLog> logsList=monitorVideoLogManageService.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), workTaskSafetyAlarm.getResourceToolId()).getData();
		EbcMonitorVideoLog ebcMonitorVideoLog=null;
		if (!CollectionUtils.isEmpty(logsList)) {
			ebcMonitorVideoLog=logsList.get(0);
			ebcMonitorVideoLog.setVideoFileUrl(uploadFileService.getFileUrl(ebcMonitorVideoLog.getVideoUrl()));
		}
		
		Map<String,Object> resultMap= new HashMap<String, Object>();
		resultMap.put("alarmInfo", workTaskSafetyAlarm);
		resultMap.put("pictureInfo", pictureMap);
		resultMap.put("videoInfo", ebcMonitorVideoLog);
		return CommonResponse.ok(resultMap);
	}
}

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

@@ -1,7 +1,10 @@
package com.ai.bss.security.protection.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,32 +43,7 @@ public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageSe
		}
		for (MonitorVideoLog monitorVideoLog : response.getData()) {
			EbcMonitorVideoLog ebcMonitorVideoLog = new EbcMonitorVideoLog();
			ComponentReflectionUtils.copyAttributeFromParent(monitorVideoLog, ebcMonitorVideoLog);
			String videoUrl = monitorVideoLog.getVideoUrl();
			if (StringUtils.isBlank(videoUrl) || videoUrl.length() < 18 || videoUrl.lastIndexOf(".") < 14) {
				ebcMonitorVideoLog.setFileType("");
				ebcMonitorVideoLog.setFileName(videoUrl);
				list.add(ebcMonitorVideoLog);
			}
			String fileType = videoUrl.substring(videoUrl.lastIndexOf(".")+1);
			
			String newFileName = videoUrl.substring(videoUrl.lastIndexOf("_")+1);
			int videoPrefixIndex = newFileName.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO);
			String fileNameData = newFileName.substring(
					videoPrefixIndex + EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO.length(),
					videoPrefixIndex + EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO.length() + 14);
			
			String newFileNameData = DateUtil
					.formatDate(DateUtil.convertDate(fileNameData, DateUtil.PURE_DATETIME_PATTERN), "MM月dd日 HH:mm");
			ebcMonitorVideoLog.setFileType(fileType);
			ebcMonitorVideoLog.setFileName(newFileNameData);
			ebcMonitorVideoLog.setBeginTimeStr(DateUtil.formatDate(monitorVideoLog.getBeginTime()));
			ebcMonitorVideoLog.setEndTimeStr(DateUtil.formatDate(monitorVideoLog.getEndTime()));
			
			EbcMonitorVideoLog ebcMonitorVideoLog = getEbcMonitorVideoLog(monitorVideoLog);
			list.add(ebcMonitorVideoLog);
		}
@@ -81,33 +59,67 @@ public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageSe
			return CommonResponse.fail("504", "监控视频不存在");
		}
		EbcMonitorVideoLog ebcMonitorVideoLog = getEbcMonitorVideoLog(response.getData());
		return CommonResponse.ok(ebcMonitorVideoLog);
	}
	@Override
	public CommonResponse<List<EbcMonitorVideoLog>> getMonitorVideoLogByPictureTime(String imageTime,
			String resourceToolId) throws Exception {
		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);
		}
		for (MonitorVideoLog monitorVideoLog : response.getData()) {
			EbcMonitorVideoLog ebcMonitorVideoLog = getEbcMonitorVideoLog(monitorVideoLog);
			list.add(ebcMonitorVideoLog);
		}
		return CommonResponse.ok(list);
	}
	/**
	 * 根据MonitorVideoLog获取EbcMonitorVideoLog
	 * @param monitorVideoLog
	 * @return
	 * @throws Exception 
	 */
	private EbcMonitorVideoLog getEbcMonitorVideoLog(MonitorVideoLog monitorVideoLog) throws Exception {
		EbcMonitorVideoLog ebcMonitorVideoLog = new EbcMonitorVideoLog();
		ComponentReflectionUtils.copyAttributeFromParent(response.getData(), ebcMonitorVideoLog);
		ComponentReflectionUtils.copyAttributeFromParent(monitorVideoLog, ebcMonitorVideoLog);
		String videoUrl = response.getData().getVideoUrl();
		String videoUrl = monitorVideoLog.getVideoUrl();
		if (StringUtils.isBlank(videoUrl) || videoUrl.length() < 18 || videoUrl.lastIndexOf(".") < 14) {
			ebcMonitorVideoLog.setFileType("");
			ebcMonitorVideoLog.setFileName(videoUrl);
			return CommonResponse.ok(ebcMonitorVideoLog);
			return ebcMonitorVideoLog;
		}
		
		String fileType = videoUrl.substring(videoUrl.lastIndexOf(".")+1);
		
		String newFileName = videoUrl.substring(videoUrl.lastIndexOf("_")+1);
		String fileType = videoUrl.substring(videoUrl.lastIndexOf(".") + 1);
		String newFileName = videoUrl.substring(videoUrl.lastIndexOf("_") + 1);
		int videoPrefixIndex = newFileName.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO);
		String fileNameData = newFileName.substring(
				videoPrefixIndex + EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO.length(),
				videoPrefixIndex + EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO.length() + 14);
		String newFileNameData = DateUtil.formatDate(DateUtil.convertDate(fileNameData, DateUtil.PURE_DATETIME_PATTERN),
				"MM月dd日 HH:mm");
		Date fileDateTime = DateUtil.convertDate(fileNameData, DateUtil.PURE_DATETIME_PATTERN);
		String newFileNameData = DateUtil.formatDate(fileDateTime, "MM月dd日 HH:mm");
		String fileDateTimeStr = DateUtil.formatDate(fileDateTime);
		ebcMonitorVideoLog.setFileType(fileType);
		ebcMonitorVideoLog.setFileName(newFileNameData);
		ebcMonitorVideoLog.setBeginTimeStr(DateUtil.formatDate(response.getData().getBeginTime()));
		ebcMonitorVideoLog.setEndTimeStr(DateUtil.formatDate(response.getData().getEndTime()));
		ebcMonitorVideoLog.setBeginTimeStr(DateUtil.formatDate(monitorVideoLog.getBeginTime()));
		ebcMonitorVideoLog.setEndTimeStr(DateUtil.formatDate(monitorVideoLog.getEndTime()));
		ebcMonitorVideoLog.setFileDateTimeStr(fileDateTimeStr);
		return CommonResponse.ok(ebcMonitorVideoLog);
		return ebcMonitorVideoLog;
	}
	@Override

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

@@ -1,5 +1,6 @@
package com.ai.bss.security.protection.service.impl;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -170,7 +171,7 @@ public class UploadFileServiceImpl implements UploadFileService {
		}
		resultMap.put("fileUrl", minioFileUrl);
		String newFileName = fileName.substring(fileName.lastIndexOf(SPLIT_CHAR)+1);
		String newFileName = fileName.substring(fileName.lastIndexOf(SPLIT_CHAR) + 1);
		int fileNameIndex = newFileName.lastIndexOf(".");
		if (newFileName.length() < 18 || fileNameIndex < 14) {
			return resultMap;
@@ -184,9 +185,10 @@ public class UploadFileServiceImpl implements UploadFileService {
			String fileNameData = newFileName.substring(
					videoPrefixIndex + EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO.length(),
					videoPrefixIndex + EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO.length() + 14);
			String newFileNameData = DateUtil
					.formatDate(DateUtil.convertDate(fileNameData, DateUtil.PURE_DATETIME_PATTERN), "MM月dd日 HH:mm");
			Date fileDataTime = DateUtil.convertDate(fileNameData, DateUtil.PURE_DATETIME_PATTERN);
			String newFileNameData = DateUtil.formatDate(fileDataTime, "MM月dd日 HH:mm");
			resultMap.put("fileName", newFileNameData);
			resultMap.put("fileDataTimeStr", DateUtil.formatDate(fileDataTime));
		} else if (newFileName.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE) > 0) {
			int picturePrefixIndex = newFileName.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE);
@@ -194,15 +196,17 @@ public class UploadFileServiceImpl implements UploadFileService {
			String fileNameData = newFileName.substring(
					picturePrefixIndex + EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE.length(),
					picturePrefixIndex + EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE.length() + 14);
			String newFileNameData = DateUtil
					.formatDate(DateUtil.convertDate(fileNameData, DateUtil.PURE_DATETIME_PATTERN), "MM月dd日 HH:mm:ss");
			Date fileDataTime = DateUtil.convertDate(fileNameData, DateUtil.PURE_DATETIME_PATTERN);
			String newFileNameData = DateUtil.formatDate(fileDataTime, "MM月dd日 HH:mm:ss");
			String pictureSerialNum = newFileName.substring(
					picturePrefixIndex + EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE.length() + 14, fileNameIndex);
			resultMap.put("fileName", newFileNameData + " " + pictureSerialNum);
			resultMap.put("fileDataTimeStr", DateUtil.formatDate(fileDataTime));
		} else {
			resultMap.put("fileType", "");
			resultMap.put("fileName", newFileName);
			resultMap.put("fileDateTimeStr", "");
		}
		return resultMap;

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

@@ -9,6 +9,8 @@ import com.ai.bss.work.task.model.common.WorkTask;
import java.util.List;
import java.util.Map;
import org.springframework.web.bind.annotation.RequestParam;
public interface AiAlarmManageService {
	CommonResponse<PageBean<Map<String, Object>>> queryPageAiAlarm(Map<String, Object> params, int pageNumber,
			int pageSize);
@@ -16,6 +18,14 @@ public interface AiAlarmManageService {
	CommonResponse<WorkTask> changeTaskStatus(CommonRequest<WorkTask> workTaskRequest);
	/**
	 * 查询单个AI告警信息
	 * @param workTaskId
	 * @return
	 * @throws Exception
	 */
	CommonResponse<Map<String,Object>> queryOneAiAlarmInfo(@RequestParam String workTaskId) throws Exception;
	
	/**
	 * AI任务模型匹配下拉列表
	 * @return
	 */

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

@@ -31,6 +31,15 @@ public interface MonitorVideoLogManageService {
	CommonResponse<EbcMonitorVideoLog> queryMonitorVideoLogById(Long monitorVideoLogId) throws Exception;
	/**
	 * 根据设备图片时间查询视频日志
	 * @param imageTime
	 * @param resourceToolId
	 * @return
	 * @throws Exception
	 */
	CommonResponse<List<EbcMonitorVideoLog>> getMonitorVideoLogByPictureTime(String imageTime,String resourceToolId) throws Exception;
	
	/**
	 * 创建监控视频日志
	 * @param monitorVideoLog
	 * @return