新增首页AI识别进出记录

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

@@ -133,7 +133,7 @@ public class EmployeeManagementController {
	@ResponseBody
	@RequestMapping("/uploadEmployeePicture")
	public CommonResponse<Map<String, String>> uploadEmployeePicture(
			@RequestParam(value = "picture") MultipartFile meFile, @RequestParam(required = false) String pictureUrl)
			@RequestParam(value = "file") MultipartFile meFile, @RequestParam(required = false) String pictureUrl)
			throws Exception {
		if (meFile == null || StringUtils.isEmpty(meFile.getOriginalFilename())) {
			return CommonResponse.fail("500", "上传失败");

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

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@@ -72,5 +73,19 @@ public class InAndOutRecordController {
		return aiIdenLogManageService.queryOneAiIdenLog(aiIdenLogId);
	}
	
	/**
	 * 首页查询进出记录
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryHomeLastInAndOutRecord")
	public CommonResponse<List<Map<String, Object>>> queryHomeLastInAndOutRecord(@RequestParam String monitorSceneId) throws Exception {
		Map<String, String> params=new HashMap<String, String>();
		params.put("sceneId", monitorSceneId);
		params.put("aiIdenModel", EbcConstant.AI_MODEL_FACE);
		
		return aiIdenLogManageService.selectLastAiIdenLog(params);
	}
}

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

@@ -154,7 +154,7 @@ public class ResourceToolManageController {
	@ResponseBody
	@RequestMapping("/uploadResourceToolPicture")
	public CommonResponse<Map<String, String>> uploadResourceToolPicture(
			@RequestParam(value = "picture") MultipartFile meFile, @RequestParam(required = false) String pictureUrl)
			@RequestParam(value = "file") MultipartFile meFile, @RequestParam(required = false) String pictureUrl)
			throws Exception {
		if (meFile == null || StringUtils.isEmpty(meFile.getOriginalFilename())) {
			return CommonResponse.fail("500", "上传失败");

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

@@ -1,5 +1,6 @@
package com.ai.bss.security.protection.service.impl;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -13,6 +14,7 @@ import org.springframework.util.CollectionUtils;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.components.minio.config.MinioConfig;
import com.ai.bss.security.protection.model.EbcMonitorVideoLog;
import com.ai.bss.security.protection.service.interfaces.AiIdenLogManageService;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
@@ -51,6 +53,9 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
	@Autowired
	private MonitorVideoLogManageService monitorVideoLogManageService;
	@Autowired
	private MinioConfig minioConfig;
	@Override
	public CommonResponse<PageBean<Map<String, Object>>> queryPageAiIdenLog(Map<String, Object> params, int pageNumber,
			int pageSize) throws Exception {
@@ -69,24 +74,34 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
		for (Map<String, Object> dataMap : response.getData().getData()) {
			dataMap.put("taskExecuteTime", DateUtil.formatObjectToDate(dataMap.get("taskExecuteTime")));
			dataMap.put("idenPictureSnapDate", DateUtil.formatObjectToDate(dataMap.get("idenPictureSnapDate")));
			
			// 结果详情
			String idenResultString = dataMap.get("idenResult") == null ? "" : String.valueOf(dataMap.get("idenResult"));
			String idenResultString = dataMap.get("idenResult") == null ? ""
					: String.valueOf(dataMap.get("idenResult"));
			if (StringUtils.isNotEmpty(idenResultString)) {
				Object idenResultObject = JSON.parse(idenResultString);
				 if (idenResultObject instanceof JSONObject) {
					 Map<String, String> idenResultMap=JSON.parseObject(idenResultString, Map.class);
					 dataMap.putAll(idenResultMap);
				 }else if (idenResultObject instanceof JSONArray) {
					 List<Map<String, String>> idenResultList = JSONArray.parseObject(idenResultString, List.class);
						if (!CollectionUtils.isEmpty(idenResultList)) {
							dataMap.putAll(idenResultList.get(0));
						}
				 }
				if (idenResultObject instanceof JSONObject) {
					Map<String, String> idenResultMap = JSON.parseObject(idenResultString, Map.class);
					dataMap.putAll(idenResultMap);
					if (idenResultMap.get("simi") != null) {
						Object simiObject = idenResultMap.get("simi");
						BigDecimal simiBigDecimal = new BigDecimal(String.valueOf(simiObject));
						float simi = simiBigDecimal.multiply(new BigDecimal("100"))
								.setScale(2, BigDecimal.ROUND_HALF_UP).floatValue();
						dataMap.put("simi", simi + "%");
					}
				} else if (idenResultObject instanceof JSONArray) {
					List<Map<String, String>> idenResultList = JSONArray.parseObject(idenResultString, List.class);
					if (!CollectionUtils.isEmpty(idenResultList)) {
						dataMap.putAll(idenResultList.get(0));
					}
				}
			}
			// 员工信息
			if (dataMap.get("relateEmployeeRoleId") == null) {
			if (dataMap.get("relateEmployeeRoleId") != null) {
				long relateEmployeeRoleId = Long.parseLong(String.valueOf(dataMap.get("relateEmployeeRoleId")));
				EmployeeDto employeeDto = new EmployeeDto();
@@ -98,7 +113,7 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
					dataMap.put("employeeName", employeeResponse.getData().getName());
					dataMap.put("employeeCode", employeeResponse.getData().getCode());
					dataMap.put("companyName", employeeResponse.getData().getField4());
					dataMap.put("companyId", employeeResponse.getData().getField4());
					dataMap.put("organizationCode", employeeResponse.getData().getOrganizeCode());
					dataMap.put("organizationName", employeeResponse.getData().getOrgName());
@@ -139,7 +154,7 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
			String pictureUrl = String.valueOf(dataMap.get("idenPictureUrl"));
			if (pictureUrl.length() > 20 && pictureUrl.lastIndexOf(".") > 18
					&& pictureUrl.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE) > 0) {
				
				int picturePrefixIndex = pictureUrl.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE)
						+ EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE.length();
				String fileName = pictureUrl.substring(picturePrefixIndex, picturePrefixIndex + 4) + "-"
@@ -171,18 +186,30 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
				new TypeReference<Map<String, String>>() {
				});
		aiIdenLogInfoMap.put("taskExecuteTime",
				DateUtil.formatDate(Long.valueOf(aiIdenLogInfoMap.get("taskExecuteTime"))));
		// 结果详情
		if (StringUtils.isNotEmpty(aiIdenLog.getIdenResult())) {
			Object idenResultObject = JSON.parse(aiIdenLog.getIdenResult());
			 if (idenResultObject instanceof JSONObject) {
				 Map<String, String> idenResultMap=JSON.parseObject(aiIdenLog.getIdenResult(), Map.class);
				 aiIdenLogInfoMap.putAll(idenResultMap);
			 }else if (idenResultObject instanceof JSONArray) {
				 List<Map<String, String>> idenResultList = JSONArray.parseObject(aiIdenLog.getIdenResult(), List.class);
					if (!CollectionUtils.isEmpty(idenResultList)) {
						aiIdenLogInfoMap.putAll(idenResultList.get(0));
					}
			 }
			if (idenResultObject instanceof JSONObject) {
				Map<String, String> idenResultMap = JSON.parseObject(aiIdenLog.getIdenResult(), Map.class);
				aiIdenLogInfoMap.putAll(idenResultMap);
				if (idenResultMap.get("simi") != null) {
					Object simiObject = idenResultMap.get("simi");
					BigDecimal simiBigDecimal = new BigDecimal(String.valueOf(simiObject));
					float simi = simiBigDecimal.multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP)
							.floatValue();
					aiIdenLogInfoMap.put("simi", simi + "%");
				}
			} else if (idenResultObject instanceof JSONArray) {
				List<Map<String, String>> idenResultList = JSONArray.parseObject(aiIdenLog.getIdenResult(), List.class);
				if (!CollectionUtils.isEmpty(idenResultList)) {
					aiIdenLogInfoMap.putAll(idenResultList.get(0));
				}
			}
		}
		// 员工信息
@@ -198,6 +225,10 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
				aiIdenLogInfoMap.put("employeeName", employeeResponse.getData().getName());
				aiIdenLogInfoMap.put("employeeCode", employeeResponse.getData().getCode());
				String headerImageName = employeeResponse.getData().getField1();
				String headerImage = uploadFileService.getFileUrl(headerImageName, minioConfig.getBucketHeaderImage());
				aiIdenLogInfoMap.put("headerImage", headerImage);
				/*
				String employeePosition = employeeResponse.getData().getMainJobPosition();
				aiIdenLogInfoMap.put("employeePosition", employeePosition);
@@ -238,6 +269,73 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
	}
	@Override
	public CommonResponse<List<Map<String, Object>>> selectLastAiIdenLog(Map<String, String> params) throws Exception {
		CommonRequest<Map<String, String>> request = new CommonRequest<Map<String, String>>(params);
		CommonResponse<List<Map<String, Object>>> response = aiTaskQuery
				.selectAiIdenLogBySceneIdAndAiIdenModel(request);
		if (response == null || response.getData() == null || CollectionUtils.isEmpty(response.getData())) {
			return response;
		}
		for (Map<String, Object> dataMap : response.getData()) {
			dataMap.put("taskExecuteTime", DateUtil.formatObjectToDate(dataMap.get("taskExecuteTime")));
			String idenPictureName = String.valueOf(dataMap.get("idenPictureUrl"));
			String idenPictureUrl = uploadFileService.getFileUrl(idenPictureName);
			dataMap.put("idenPictureUrl", idenPictureUrl);
			
			// 结果详情
			String idenResultString = dataMap.get("idenResult") == null ? ""
					: String.valueOf(dataMap.get("idenResult"));
			if (StringUtils.isNotEmpty(idenResultString)) {
				Object idenResultObject = JSON.parse(idenResultString);
				if (idenResultObject instanceof JSONObject) {
					Map<String, String> idenResultMap = JSON.parseObject(idenResultString, Map.class);
					dataMap.putAll(idenResultMap);
					if (idenResultMap.get("simi") != null) {
						Object simiObject = idenResultMap.get("simi");
						BigDecimal simiBigDecimal = new BigDecimal(String.valueOf(simiObject));
						float simi = simiBigDecimal.multiply(new BigDecimal("100"))
								.setScale(2, BigDecimal.ROUND_HALF_UP).floatValue();
						dataMap.put("simi", simi + "%");
					}
				} else if (idenResultObject instanceof JSONArray) {
					List<Map<String, String>> idenResultList = JSONArray.parseObject(idenResultString, List.class);
					if (!CollectionUtils.isEmpty(idenResultList)) {
						dataMap.putAll(idenResultList.get(0));
					}
				}
			}
			// 员工信息
			if (dataMap.get("relateEmployeeRoleId") != null) {
				long relateEmployeeRoleId = Long.parseLong(String.valueOf(dataMap.get("relateEmployeeRoleId")));
				EmployeeDto employeeDto = new EmployeeDto();
				employeeDto.setId(relateEmployeeRoleId);
				CommonRequest<EmployeeDto> requestEmployeeDto = CommonRequest.<EmployeeDto>builder().data(employeeDto)
						.build();
				CommonResponse<EmployeeDto> employeeResponse = employeeService.queryEmployee(requestEmployeeDto);
				if (employeeResponse.getData() != null) {
					dataMap.put("employeeName", employeeResponse.getData().getName());
					dataMap.put("employeeCode", employeeResponse.getData().getCode());
					String headerImageName = employeeResponse.getData().getField1();
					String headerImage = uploadFileService.getFileUrl(headerImageName,
							minioConfig.getBucketHeaderImage());
					dataMap.put("headerImage", headerImage);
				}
			}
		}
		return response;
	}
	@Override
	public CommonResponse<AiIdenLog> createAiIdenLog(AiIdenLog aiIdenLog) throws Exception {
		CommonRequest<AiIdenLog> aiIdenLogRequest = new CommonRequest<AiIdenLog>(aiIdenLog);
		return aiTaskCommand.createAiIdenLog(aiIdenLogRequest);

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

@@ -45,6 +45,14 @@ public interface AiIdenLogManageService {
	CommonResponse<Map<String, Object>> queryOneAiIdenLog(Long aiIdenLogId) throws Exception;
	/**
	 * 查询所有设备最后一个识别记录
	 * @param params
	 * @return
	 * @throws Exception
	 */
	CommonResponse<List<Map<String, Object>>> selectLastAiIdenLog(Map<String, String> params) throws Exception;
	
	/**
	 * 创建AI执行结果
	 * @param aiIdenLog
	 * @return