修改AI识别进出记录

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

@@ -27,6 +27,7 @@ import com.ai.bss.work.safety.service.api.AiTaskCommand;
import com.ai.bss.work.safety.service.api.AiTaskQuery;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
@Service
@@ -70,12 +71,18 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
			dataMap.put("idenPictureSnapDate", DateUtil.formatObjectToDate(dataMap.get("idenPictureSnapDate")));
			
			// 结果详情
			String idenResultArr = dataMap.get("idenResult") == null ? "" : String.valueOf(dataMap.get("idenResult"));
			if (StringUtils.isNotEmpty(idenResultArr)) {
				List<Map<String, String>> idenResultList = JSONArray.parseObject(idenResultArr, List.class);
				if (!CollectionUtils.isEmpty(idenResultList)) {
					dataMap.putAll(idenResultList.get(0));
				}
			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));
						}
				 }
			}
			// 员工信息
@@ -166,10 +173,16 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
		// 结果详情
		if (StringUtils.isNotEmpty(aiIdenLog.getIdenResult())) {
			List<Map<String, String>> idenResultList = JSONArray.parseObject(aiIdenLog.getIdenResult(), List.class);
			if (!CollectionUtils.isEmpty(idenResultList)) {
				aiIdenLogInfoMap.putAll(idenResultList.get(0));
			}
			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));
					}
			 }
		}
		// 员工信息

security-protection-service/src/main/java/com/ai/bss/security/protection/service/task/AiResultRecordKafkaTask.java

@@ -14,8 +14,9 @@ import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.abc.util.JsonUtils;
import com.ai.bss.security.protection.service.interfaces.AiIdenLogManageService;
import com.ai.bss.security.protection.service.interfaces.ResourceToolManageService;
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.AiIdenLog;
import com.ai.bss.work.safety.service.api.AiTaskCommand;
import com.ai.bss.work.safety.service.api.MonitorSceneQuery;
@@ -38,14 +39,14 @@ public class AiResultRecordKafkaTask {
	private AiTaskCommand aiTaskCommand;
	@Autowired
	private ResourceToolManageService resourceToolManageService;
	@Autowired
	private MonitorSceneQuery monitorSceneQuery;
	@Autowired
	private AiIdenLogManageService aiIdenLogManageService;
	@Autowired
	private EmployeeService employeeService;
	@KafkaListener(containerFactory = "kafkaBatchListener6", topics = "${kafka.topic.aitask:topic_ai_task}", groupId = "ai_group")
	public void AiResultRecordListener(ConsumerRecord<String, String> records, Acknowledgment ack) throws Throwable {
		try {
@@ -54,11 +55,15 @@ public class AiResultRecordKafkaTask {
			String message = records.value();
			log.info("已接AI任务执行结果消息，消息为：" + message);
			AiIdenLog aiIdenLog = JSON.parseObject(message, new TypeReference<AiIdenLog>() {
			});
			JSONObject messageJson = JSONObject.parseObject(message);
			String resourceToolId = messageJson.getString("resourceToolId");
			String idenResultType = messageJson.getString("idenResultType");
			Long relateEmployeeRoleId = messageJson.getLong("relateEmployeeRoleId");
			// 查询相关数据
			// 关联场景信息
			CommonResponse<List<Map<String, Object>>> sceneTerminalRelResponse = monitorSceneQuery
					.selectSceneTerminalRel(new CommonRequest<Long>(Long.valueOf(resourceToolId)));
			if (sceneTerminalRelResponse == null || CollectionUtils.isEmpty(sceneTerminalRelResponse.getData())) {
@@ -68,9 +73,6 @@ public class AiResultRecordKafkaTask {
			Map<String, Object> sceneTerminalRelMap = sceneTerminalRelResponse.getData().get(0);
			// 封装数据
			AiIdenLog aiIdenLog = JSON.parseObject(message, new TypeReference<AiIdenLog>() {
			});
			aiIdenLog.setMonitorSceneId(sceneTerminalRelMap.get("monitorSceneId") == null ? ""
					: String.valueOf(sceneTerminalRelMap.get("monitorSceneId")));
			aiIdenLog.setMonitorSceneName(sceneTerminalRelMap.get("monitorSceneName") == null ? ""
@@ -82,9 +84,26 @@ public class AiResultRecordKafkaTask {
			aiIdenLog.setOrganizationId(
					sceneTerminalRelMap.get("orgId") == null ? "" : String.valueOf(sceneTerminalRelMap.get("orgId")));
			// TODO 人员信息暂时默认
			aiIdenLog.setRelateEmployeeRoleId("201613310867");
			aiIdenLog.setRelateEmployeeRoleName("王浩");
			// 关联员工信息
			EmployeeDto employeeDto = null;
			if (relateEmployeeRoleId != null) {
				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) {
					employeeDto = null;
				} else {
					employeeDto = employeeDtoResponse.getData();
				}
			}
			if (employeeDto != null) {
				aiIdenLog.setRelateEmployeeRoleName(employeeDto.getName());
				aiIdenLog.setOrganizationId(String.valueOf(employeeDto.getOrganizeId()));
			} else {
				aiIdenLog.setRelateEmployeeRoleId("-1");
				aiIdenLog.setRelateEmployeeRoleName(null);
			}
			// 执行操作
			CommonResponse<AiIdenLog> aiIdenLogRunningResult = aiIdenLogManageService.createAiIdenLog(aiIdenLog);