修改设备时同时修改AI任务和关联场景

security-protection-service/src/main/java/com/ai/bss/security/protection/config/MyCorsFilter.java

@@ -50,7 +50,8 @@ public class MyCorsFilter {
    public FilterRegistrationBean mySessionUserFilter(){
        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
        registrationBean.setFilter(new SessionUserFilter());
        registrationBean.setUrlPatterns(Arrays.asList("/mySessionUserFilter"));
        //registrationBean.setUrlPatterns(Arrays.asList("/mySessionUserFilter"));
        registrationBean.setUrlPatterns(Arrays.asList("/login/*"));
        Map<String, String> initParameters = new HashMap<String,String>();
        initParameters.put("impl-classname","com.ai.sso.external.DefaultPopedomImpl");
        initParameters.put("ALLOWPATH","gif;jpg;jpeg;png;login;checkLogin;genVerificationCode;logout;");

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

@@ -69,4 +69,15 @@ public class HomePageController {
		return homePageService.queryAlarmAnalysisList(params, dataSize);
	}
	
	/**
	 * 查询4条进出记录
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryHomeLastInAndOutRecord")
	public CommonResponse<List<Map<String, Object>>> queryFourInAndOutRecord(@RequestParam Long monitorSceneId) throws Exception {
		return homePageService.queryFourInAndOutRecord(monitorSceneId);
	}
}

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

@@ -15,7 +15,6 @@ 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;
import com.ai.bss.security.protection.service.interfaces.MonitorVideoLogManageService;
@@ -260,14 +259,14 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
			ebcMonitorVideoLog = logsList.get(0);
			ebcMonitorVideoLog.setVideoFileUrl(uploadFileService.getFileUrl(ebcMonitorVideoLog.getVideoUrl()));
		}*/
		String videoFileUrl =monitorVideoLogManageService
		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/HomePageServiceImpl.java

@@ -1,11 +1,13 @@
package com.ai.bss.security.protection.service.impl;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
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;
@@ -13,11 +15,22 @@ 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.components.minio.config.MinioConfig;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
import com.ai.bss.security.protection.service.interfaces.HomePageService;
import com.ai.bss.security.protection.service.interfaces.MonitorSceneTerminalService;
import com.ai.bss.security.protection.service.interfaces.UploadFileService;
import com.ai.bss.security.protection.utils.DateUtil;
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.attendance.service.api.AttendanceChartQuery;
import com.ai.bss.work.safety.model.MonitorSceneTerminalRel;
import com.ai.bss.work.safety.service.api.AiTaskQuery;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@Service
public class HomePageServiceImpl implements HomePageService {
@@ -31,6 +44,18 @@ public class HomePageServiceImpl implements HomePageService {
	@Autowired
	private CharSpecService charSpecService;
	@Autowired
	private MonitorSceneTerminalService monitorSceneTerminalService;
	@Autowired
	private UploadFileService uploadFileService;
	@Autowired
	private EmployeeService employeeService;
	@Autowired
	private MinioConfig minioConfig;
	@Override
	public Map<String, Object> queryAttendanceChart() throws Exception {
		CommonRequest<Void> request = new CommonRequest<Void>(null);
@@ -71,11 +96,11 @@ public class HomePageServiceImpl implements HomePageService {
		CommonRequest<Map<String, String>> request = new CommonRequest<Map<String, String>>(params);
		CommonResponse<List<Map<String, Object>>> response = aiTaskQuery.safetyAlarmAnalysis(request);
		List<Map<String, Object>> dataList=null;
		List<Map<String, Object>> dataList = null;
		if (CollectionUtils.isEmpty(response.getData())) {
			dataList=new ArrayList<Map<String, Object>>();
		}else {
			dataList=response.getData();
			dataList = new ArrayList<Map<String, Object>>();
		} else {
			dataList = response.getData();
		}
		// Map<String, String> allAiAlarmTypeMap = charSpecService.getCharSpecMap(EbcConstant.BUSINESS_SPEC_AI_ALARM_TYPE);
@@ -127,7 +152,7 @@ public class HomePageServiceImpl implements HomePageService {
				}
			}
		} else if (dataList.size() > dataSize){
		} else if (dataList.size() > dataSize) {
			// 有数据的条数大于需显示的条数(其他>0)
			Map<String, Object> map = new HashMap<String, Object>();
			map.put("value", otherNum);
@@ -138,4 +163,124 @@ public class HomePageServiceImpl implements HomePageService {
		return CommonResponse.ok(resultList);
	}
	@Override
	public CommonResponse<List<Map<String, Object>>> queryFourInAndOutRecord(Long monitorSceneId) throws Exception {
		// 获取设备信息
		CommonResponse<List<MonitorSceneTerminalRel>> resourceToolResponse = monitorSceneTerminalService
				.queryMonitorSceneTerminalRel(monitorSceneId);
		List<Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();
		if (resourceToolResponse == null || CollectionUtils.isEmpty(resourceToolResponse.getData())) {
			return CommonResponse.ok(resultList);
		}
		// 获取四条进出记录
		int resourceToolSize = resourceToolResponse.getData().size();
		if (resourceToolSize == 1) {
			String resourceToolId = resourceToolResponse.getData().get(0).getResourceToolId();
			resultList = getAiIdenLogList(resourceToolId, 4);
		} else if (resourceToolSize == 2) {
			for (MonitorSceneTerminalRel mstr : resourceToolResponse.getData()) {
				List<Map<String, Object>> aiIdenLogList = getAiIdenLogList(mstr.getResourceToolId(), 2);
				resultList.addAll(aiIdenLogList);
			}
		} else if (resourceToolSize == 3) {
			String resourceToolId = resourceToolResponse.getData().get(0).getResourceToolId();
			resultList = getAiIdenLogList(resourceToolId, 2);
			for (int i = 1; i < resourceToolSize; i++) {
				resourceToolId = resourceToolResponse.getData().get(i).getResourceToolId();
				List<Map<String, Object>> aiIdenLogList = getAiIdenLogList(resourceToolId, 1);
				resultList.addAll(aiIdenLogList);
			}
		} else {
			for (MonitorSceneTerminalRel mstr : resourceToolResponse.getData()) {
				List<Map<String, Object>> aiIdenLogList = getAiIdenLogList(mstr.getResourceToolId(), 1);
				resultList.addAll(aiIdenLogList);
			}
		}
		// 拼接数据
		for (Map<String, Object> dataMap : resultList) {
			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 CommonResponse.ok(resultList);
	}
	/**
	 * 根据设备获取人脸识别结果
	 * @param resourceToolId
	 * @param pageSize
	 * @return
	 */
	private List<Map<String, Object>> getAiIdenLogList(String resourceToolId, int pageSize) {
		Map<String, Object> params = new HashMap<String, Object>();
		params.put("resourceToolId", resourceToolId);
		params.put("aiIdenModel", EbcConstant.AI_MODEL_FACE);
		CommonRequest<Map<String, Object>> conditionMapRequest = new CommonRequest<Map<String, Object>>(params, 1,
				pageSize);
		CommonResponse<PageBean<Map<String, Object>>> response = aiTaskQuery.queryAiIdenLog(conditionMapRequest);
		if (response == null || response.getData() == null || CollectionUtils.isEmpty(response.getData().getData())) {
			return new ArrayList<Map<String, Object>>();
		}
		return response.getData().getData();
	}
}

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

@@ -5,7 +5,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.bss.work.safety.service.api.MonitorSceneCommand;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -17,12 +16,15 @@ 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.SecurityProtectionMinioConfig;
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.ResourceToolManageService;
import com.ai.bss.security.protection.service.interfaces.UploadFileService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.work.safety.model.AiTaskDevice;
import com.ai.bss.work.safety.model.MonitorSceneTerminalRel;
import com.ai.bss.work.safety.service.api.AiTaskCommand;
import com.ai.bss.work.safety.service.api.AiTaskQuery;
import com.ai.bss.work.safety.service.api.MonitorSceneCommand;
import com.ai.bss.work.tool.model.ResourceTool;
import com.ai.bss.work.tool.service.api.ResourceToolCommand;
import com.ai.bss.work.tool.service.api.ResourceToolQuery;
@@ -44,13 +46,15 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
	@Autowired
	private CharSpecService charSpecService;
	
	@Autowired
	private AiTaskQuery aiTaskQuery;
	@Autowired
	private MonitorSceneCommand monitorSceneCommand;
	@Autowired
	private AiTaskCommand aiTaskCommand;
	@Override
	public CommonResponse<PageBean<Map<String, Object>>> queryPageResourceTool(HashMap<String, Object> params,
@@ -166,11 +170,11 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
	@Override
	public CommonResponse<ResourceTool> createResourceTool(ResourceTool resourceTool) throws Exception {
		Map<String, Object> resourceToolMap=queryResourceToolByCode(resourceTool.getResourceToolName());
		if (resourceToolMap!=null) {
		Map<String, Object> resourceToolMap = queryResourceToolByCode(resourceTool.getResourceToolName());
		if (resourceToolMap != null) {
			return CommonResponse.fail("502", "设备编号已存在");
		}
		
		if (StringUtils.isEmpty(resourceTool.getPictureUrl())) {
			resourceTool.setPictureUrl("#");
		}
@@ -182,26 +186,67 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
	}
	@Override
	public CommonResponse<ResourceTool> modifyResourceTool(ResourceTool resourceTool) throws Exception  {
		//修改设备表
	public CommonResponse<ResourceTool> modifyResourceTool(ResourceTool resourceTool) throws Exception {
		// 修改设备表
		CommonRequest<ResourceTool> request = new CommonRequest<ResourceTool>(resourceTool);
		//修改ai任务设备表
		CommonResponse<ResourceTool> response = resourceToolCommand.saveWorkToolWithNoMapArea(request);
		return resourceToolCommand.saveWorkToolWithNoMapArea(request);
		if (response.isSuccess() && response.getData() != null) {
			// 关联场景se_monitor_scene_terminal_rel表
			modifyMonitorSceneTerminalRelByResourceTool(response.getData());
			// 修改ai任务执行设备 se_ai_task_device表
			modifyAiTaskDeviceByResourceTool(response.getData());
		}
		return response;
	}
	/**
	 * 根据设备信息修改关联场景
	 * @param resourceTool
	 * @return
	 */
	private CommonResponse<Void> modifyMonitorSceneTerminalRelByResourceTool(ResourceTool resourceTool) {
		MonitorSceneTerminalRel aiTaskDevice = new MonitorSceneTerminalRel();
		aiTaskDevice.setResourceToolId(String.valueOf(resourceTool.getResourceToolId()));
		aiTaskDevice.setResourceToolName(resourceTool.getResourceToolName());
		aiTaskDevice.setPictureUrl(resourceTool.getPictureUrl());
		aiTaskDevice.setVideoUrl(resourceTool.getVideoUrl());
		CommonRequest<MonitorSceneTerminalRel> request = new CommonRequest<MonitorSceneTerminalRel>(aiTaskDevice);
		return monitorSceneCommand.modifyMonitorSceneTerminalRelByDeviceId(request);
	}
	/**
	 * 根据设备信息修改AI任务
	 * @param resourceTool
	 * @return
	 */
	private CommonResponse<Void> modifyAiTaskDeviceByResourceTool(ResourceTool resourceTool) {
		AiTaskDevice aiTaskDevice = new AiTaskDevice();
		aiTaskDevice.setResourceToolId(String.valueOf(resourceTool.getResourceToolId()));
		aiTaskDevice.setResourceToolCode(resourceTool.getResourceToolCode());
		aiTaskDevice.setResourceToolName(resourceTool.getResourceToolName());
		CommonRequest<AiTaskDevice> request = new CommonRequest<AiTaskDevice>(aiTaskDevice);
		return aiTaskCommand.modifyAiTaskDeviceByDeviceId(request);
	}
	@Override
	public CommonResponse<Void> deleteResourceTool(List<String> resourceToolIds) throws Exception  {
	public CommonResponse<Void> deleteResourceTool(List<String> resourceToolIds) throws Exception {
		CommonRequest<List<String>> request = new CommonRequest<List<String>>(resourceToolIds);
		//删除设备表里数据
		// 删除设备表里数据
		CommonResponse<ResourceTool> response = resourceToolCommand.deleteWorkTool(request);
		//删除关联数据 关联场景
		CommonResponse deleteResult = monitorSceneCommand.deleteMonitorSceneTerminalRelByWorkToolId(
					new CommonRequest<>(resourceToolIds));
		//删除ai任务执行设备 se_ai_task_device表
		if (response.isSuccess()) {
			// 删除关联场景se_monitor_scene_terminal_rel表
			monitorSceneCommand.deleteMonitorSceneTerminalRelByWorkToolId(new CommonRequest<>(resourceToolIds));
			// 删除ai任务执行设备 se_ai_task_device表
			resourceToolIds.forEach(resourceToolId -> {
				aiTaskCommand.deleteAiTaskDeviceByDeviceId(new CommonRequest<String>(resourceToolId));
			});
			return CommonResponse.ok(null);
		} else {
			return CommonResponse.fail(response.getFail());
@@ -231,9 +276,9 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
	@Override
	public CommonResponse<List<Map<String, Object>>> getResourceToolAllInfo(String resourceToolCode) {
		Map<String, Object> conditionMap = new HashMap<String, Object>();
        conditionMap.put("resourceToolCode", resourceToolCode);
        CommonRequest<Map<String, Object>> request=new CommonRequest<Map<String, Object>>(conditionMap);
        return aiTaskQuery.selectAiTaskDevice(request);
		conditionMap.put("resourceToolCode", resourceToolCode);
		CommonRequest<Map<String, Object>> request = new CommonRequest<Map<String, Object>>(conditionMap);
		return aiTaskQuery.selectAiTaskDevice(request);
	}
	
}

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

@@ -28,4 +28,13 @@ public interface HomePageService {
	 */
	CommonResponse<List<Map<String, Object>>> queryAlarmAnalysisList(Map<String, String> params, int dataSize)
			throws Exception;
	
	/**
	 * 查询4条进出记录
	 * @param monitorSceneId
	 * @return
	 * @throws Exception
	 */
	CommonResponse<List<Map<String, Object>>> queryFourInAndOutRecord(Long monitorSceneId) throws Exception;
	
}