新增人员等功能

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

@@ -1,31 +1,27 @@
package com.ai.bss.security.protection.controller;
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.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;
import com.ai.bss.work.safety.model.AiTask;
import com.ai.bss.work.task.model.common.WorkTask;
import com.ai.bss.work.tool.model.ResourceTool;
import com.github.pagehelper.PageInfo;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
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.security.protection.model.AiQuery;
import com.ai.bss.security.protection.service.interfaces.AiAlarmManageService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.work.task.model.common.WorkTask;
/**
 * AI报警管理
@@ -38,43 +34,42 @@ public class AiAlarmManageController {
	@Autowired
	AiAlarmManageService aiAlarmManageService;
	 /**
	 * 分页查询AI报警（监控报警任务综合查询 ）
	 * @param aiQuery 查询条件，具体如下：
	 *                            workOrgRoleId: 组织ID
	 *                            alarmTypeCode: 报警类型
	 *                            targetEmployeeRoleId: 被报警人
	 *                            workEmployeeRoleId: 处理人
	 *                            beginTime: 报警开始时间
	 *                            endTime: 报警结束时间
	 *                            statusList: 处理状态列表
	 * @return 结果集，具体如下：
	 *                            状态、状态时间、处理详情、报警类型、报警描述、设备名称、设备编号、设备位置、报警时间、处理人、处理时间、图片url、视频url
	 */
	/**
	* 分页查询AI报警（监控报警任务综合查询 ）
	* @param aiQuery 查询条件，具体如下：
	*                            workOrgRoleId: 组织ID
	*                            alarmTypeCode: 报警类型
	*                            targetEmployeeRoleId: 被报警人
	*                            workEmployeeRoleId: 处理人
	*                            beginTime: 报警开始时间
	*                            endTime: 报警结束时间
	*                            statusList: 处理状态列表
	* @return 结果集，具体如下：
	*                            状态、状态时间、处理详情、报警类型、报警描述、设备名称、设备编号、设备位置、报警时间、处理人、处理时间、图片url、视频url
	*/
	@ResponseBody
	@RequestMapping("/queryPageAiAlarm")
	public CommonResponse<PageBean<Map<String,Object>>> queryPageAiAlarm(@ModelAttribute AiQuery aiQuery)   {
	public CommonResponse<PageBean<Map<String, Object>>> queryPageAiAlarm(@ModelAttribute AiQuery aiQuery) {
		// 当前页数
		int pageNumber = aiQuery.getPageNumber() < 1 ? 1 : aiQuery.getPageNumber();
		// 每页条数
		int pageSize = aiQuery.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : aiQuery.getPageSize();
		Map<String, Object> params = new HashMap<>();
		params.put("workOrgRoleId",aiQuery.getWorkOrgRoleId());
		params.put("alarmTypeCode",aiQuery.getAlarmTypeCode());
		params.put("targetEmployeeRoleId",aiQuery.getTargetEmployeeRoleId());
		params.put("workEmployeeRoleId",aiQuery.getWorkEmployeeRoleId());
		params.put("beginTime",aiQuery.getBeginTime());
		params.put("endTime",aiQuery.getEndTime());
		params.put("statusList",aiQuery.getStatusList());
		params.put("workOrgRoleId", aiQuery.getWorkOrgRoleId());
		params.put("alarmTypeCode", aiQuery.getAlarmTypeCode());
		params.put("targetEmployeeRoleId", aiQuery.getTargetEmployeeRoleId());
		params.put("workEmployeeRoleId", aiQuery.getWorkEmployeeRoleId());
		params.put("beginTime", aiQuery.getBeginTime());
		params.put("endTime", aiQuery.getEndTime());
		params.put("statusList", aiQuery.getStatusList());
		CommonResponse<PageBean<Map<String,Object>>> commonResponse = aiAlarmManageService.queryPageAiAlarm(params, pageNumber, pageSize);
		CommonResponse<PageBean<Map<String, Object>>> commonResponse = aiAlarmManageService.queryPageAiAlarm(params,
				pageNumber, pageSize);
		return commonResponse;
	}
	/**
	 * 报警记录处理（包含 确认、误判、关闭 三个操作类型）（设置任务状态、状态时间、处理详情）
	 * 状态参考以下常量定义（定义在WorkTask类中）：
@@ -89,23 +84,23 @@ public class AiAlarmManageController {
	@ResponseBody
	@RequestMapping("/changeTaskStatus")
	public  CommonResponse<WorkTask> changeTaskStatus(@RequestBody AiQuery aiQuery) {
	public CommonResponse<WorkTask> changeTaskStatus(@RequestBody AiQuery aiQuery) {
		WorkTask workTask =new WorkTask();
		WorkTask workTask = new WorkTask();
		workTask.setStatusTime(new Date());
		workTask.setStatus(aiQuery.getStatus());
		workTask.setWorkTaskId(aiQuery.getWorkTaskId());
		workTask.setProcessMemo( aiQuery.getProcessMemo());
		workTask.setProcessMemo(aiQuery.getProcessMemo());
		CommonRequest<WorkTask> workTaskRequest=new CommonRequest(workTask);
		CommonRequest<WorkTask> workTaskRequest = new CommonRequest(workTask);
		CommonResponse<WorkTask> commonResponse = aiAlarmManageService.changeTaskStatus(workTaskRequest);
		return commonResponse;
	}
	
	/**
	 * 查询单个AI告警信息
	 * @param workTaskId
@@ -114,24 +109,12 @@ public class AiAlarmManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryOneAiAlarmInfo")
	public CommonResponse<Map<String,Object>> queryOneAiAlarmInfo(@RequestParam String workTaskId)
			throws Exception {
	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
	 */
	@ResponseBody
	@RequestMapping("/queryAiTaskModelList")
	public CommonResponse<List<AiModel>> queryAiTaskModelList() {
		return aiAlarmManageService.queryAiTaskModelList();
	}
	
}

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

@@ -0,0 +1,88 @@
package com.ai.bss.security.protection.controller;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
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.security.protection.service.interfaces.EmployeeManagementService;
import com.ai.bss.user.dto.EmployeeDto;
import com.ai.bss.user.dto.UserDto;
/**
 * 用户信息
 */
@Controller
@RequestMapping("/employeeManagement")
public class EmployeeManagementController {
    @Autowired
    private EmployeeManagementService employeeManagementService;
    /**
     * 分页查询用户信息
     */
    @ResponseBody
    @RequestMapping("/queryWorkEmployee")
    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(@RequestBody CommonRequest<UserDto> request) throws Exception {
		/*UserDto userDto = new UserDto();
		userDto.setOrgId(params.get("orgId"));
		userDto.setCode(params.get("code"));
		userDto.setName(params.get("name"));
		// TODO 组织编码
		userDto.setOrgCode("0000");
		// 当前页数
		int pageNumber  = Integer.parseInt(params.get("pageNumber"));
		// 每页条数
		int pageSize = Integer.parseInt(params.get("pageSize"));
		CommonRequest<UserDto> request=new CommonRequest<UserDto>(userDto, pageNumber, pageSize);
*/
        //CommonRequest<UserDto> request = CommonRequest.<UserDto>builder().data(userDto).pageNumber(pageNum).pageSize(pageSize).build();
        return employeeManagementService.queryWorkEmployee(request);
    }
    /**
     * 增加用户信息
     */
    @ResponseBody
    @RequestMapping("/createWorkEmployee")
    public CommonResponse<Void> createWorkEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
        return employeeManagementService.createWorkEmployee(employeeDto);
    }
    /**
     * 删除用户信息
     */
    @ResponseBody
    @RequestMapping("/deleteWorkEmployee")
    public CommonResponse<Void> deleteWorkEmployee(@RequestBody Map<String, String> params) throws Exception {
        if (params == null || params.get("ids") == null || "".equals(params.get("ids"))) {
            return CommonResponse.fail("500", "删除失败");
        }
        return employeeManagementService.deleteWorkEmployee(params);
    }
    /**
     * 修改用户信息
     */
    @ResponseBody
    @RequestMapping("/modifyWorkEmployee")
    public CommonResponse<Void> modifyWorkEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
        if (employeeDto == null || employeeDto.getId() == null || "".equals(employeeDto.getId())) {
            return CommonResponse.fail("500", "修改失败");
        }
        return employeeManagementService.modifyWorkEmployee(employeeDto);
    }
}

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

@@ -8,7 +8,6 @@ import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,8 +22,6 @@ import com.ai.bss.security.protection.service.interfaces.ResourceToolManageServi
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.work.tool.model.ResourceTool;
import edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault;
/**
 * 设备管理
 * @author konghl@asiainfo.com
@@ -85,12 +82,12 @@ public class ResourceToolManageController {
			return CommonResponse.fail("500", "操作失败");
		}
		Map<String, Object> resultMap= ResourceToolManageService.queryResourceToolById(resourceToolId);
		
		if (resultMap==null) {
		Map<String, Object> resultMap = ResourceToolManageService.queryResourceToolById(resourceToolId);
		if (resultMap == null) {
			return CommonResponse.fail("504", "获取设备信息失败");
		}
		
		return CommonResponse.ok(resultMap);
	}
@@ -168,4 +165,21 @@ public class ResourceToolManageController {
		return CommonResponse.ok(resultMap);
	}
	/**
	 * 根据设备CODE获取场景、AI任务等相关信息
	 * @param meFile
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/getResourceToolAllInfo")
	public CommonResponse<List<Map<String, Object>>>  getResourceToolAllInfo(@RequestParam String resourceToolCode)
			throws Exception {
		if (StringUtils.isEmpty(resourceToolCode)) {
			return CommonResponse.fail("500", "resourceToolCode is null");
		}
		return ResourceToolManageService.getResourceToolAllInfo(resourceToolCode);
	}
	
}

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

@@ -6,6 +6,7 @@ import com.ai.bss.security.protection.model.AiQuery;
import com.ai.bss.security.protection.service.interfaces.SysConfigAiTaskService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.work.safety.model.AiModel;
import com.ai.bss.work.safety.model.AiTask;
import org.slf4j.Logger;
@@ -121,5 +122,16 @@ public class SysConfigAiTaskController {
		return commonResponse;
	}
	
	/**
	 * AI任务模型匹配下拉列表
	 *
	 * @return
	 */
	@ResponseBody
	@RequestMapping("/queryAiTaskModelList")
	public CommonResponse<List<AiModel>> queryAiTaskModelList() {
		return sysConfigAiTaskService.queryAiTaskModelList();
	}
}

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

@@ -40,6 +40,7 @@ import com.alibaba.fastjson.TypeReference;
public class AiAlarmManageServiceImpl implements AiAlarmManageService {
    @Autowired
    WorkTaskCommand workTaskCommand;
    
    @Autowired
    AiTaskQuery aiTaskQuery;
@@ -81,11 +82,10 @@ public class AiAlarmManageServiceImpl implements AiAlarmManageService {
                }
            }
            //根据报警类型查找报警中文名字
			aiAlarm.put("alarmTypeName", aiAlarm.get("alarmTypeCode"));
            aiAlarmTypeList.forEach((aiAlarmType) -> {
                if (aiAlarmType.getCode().equals(aiAlarm.get("alarmTypeCode"))) {
                    aiAlarm.put("alarmTypeName", aiAlarmType.getValue());
                }else {
                    aiAlarm.put("alarmTypeName", aiAlarm.get("alarmTypeCode"));
                }
            });
        });
@@ -100,11 +100,6 @@ public class AiAlarmManageServiceImpl implements AiAlarmManageService {
    }
    
	@Override
	public CommonResponse<List<AiModel>> queryAiTaskModelList() {
		return aiTaskQuery.findAiModelList(new CommonRequest<Void>(null));
	}
	@Override
	public CommonResponse<List<Map<String, Object>>> queryAiTaskByDevice(String resourceToolId, String aiIdenModel) {
		Map<String, Object> conditionMap = new HashMap<String, Object>();
        conditionMap.put("resourceToolId", resourceToolId);

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

@@ -0,0 +1,80 @@
package com.ai.bss.security.protection.service.impl;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
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.person.model.Organization;
import com.ai.bss.person.service.api.OrganizationQuery;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
import com.ai.bss.security.protection.service.interfaces.EmployeeManagementService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.user.dto.EmployeeDto;
import com.ai.bss.user.dto.UserDto;
import com.ai.bss.user.service.api.EmployeeService;
import com.ai.bss.user.service.api.UserDtoQuery;
import com.ai.bss.worker.service.api.EmployeeTerminalRelaQuery;
@Service
public class EmployeeManagementServiceImpl implements EmployeeManagementService {
	Logger logger = LoggerFactory.getLogger(EmployeeManagementServiceImpl.class);
	@Autowired
	private UserDtoQuery userDtoQuery;
	@Autowired
	private OrganizationQuery organizationQuery;
	@Autowired
	private EmployeeService employeeService;
	@Override
	public CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception {
		// TODO 组织编码
		// request.getData().setOrgCode("0000");
		return userDtoQuery.queryWorkEmployee(request);
	}
	@Override
	public CommonResponse<Void> createWorkEmployee(EmployeeDto employeeDto) throws Exception {
		CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
		return employeeService.createWorkEmployee(request);
	}
	@Override
	public CommonResponse<Void> deleteWorkEmployee(Map<String, String> params) {
		boolean success = true;
		String ids = params.get("ids");
		String[] idsArray = ids.split(",");
		EmployeeDto employeeDto = new EmployeeDto();
		for (String id : idsArray) {
			long lid = Long.parseLong(id);
			employeeDto.setId(lid);
			CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
			CommonResponse<Void> response = employeeService.deleteWorkEmployee(request);
			success = success && response.isSuccess();
		}
		if (success) {
			return CommonResponse.ok(null);
		} else {
			return CommonResponse.fail("504", "删除失败");
		}
	}
	@Override
	public CommonResponse<Void> modifyWorkEmployee(EmployeeDto employeeDto) {
		CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
		return employeeService.modifyEmployee(request);
	}
}

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

@@ -16,10 +16,12 @@ 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.service.api.AiTaskQuery;
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;
@@ -41,6 +43,9 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
	@Autowired
	private CharSpecService charSpecService;
	
	@Autowired
	private AiTaskQuery aiTaskQuery;
	@Override
	public CommonResponse<PageBean<Map<String, Object>>> queryPageResourceTool(HashMap<String, Object> params,
@@ -209,4 +214,12 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
		return resultMap;
	}
	@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);
	}
	
}

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/SysConfigAiTaskServiceImpl.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.service.interfaces.SysConfigAiTaskService;
import com.ai.bss.work.safety.model.AiModel;
import com.ai.bss.work.safety.model.AiTask;
import com.ai.bss.work.safety.service.api.AiTaskCommand;
import com.ai.bss.work.safety.service.api.AiTaskQuery;
@@ -67,5 +68,10 @@ public class SysConfigAiTaskServiceImpl implements SysConfigAiTaskService {
        CommonResponse<AiTask> runningResult = aiTaskCommand.modifyAiTask(aiTaskRequest);
        return runningResult;
    }
    
    @Override
	public CommonResponse<List<AiModel>> queryAiTaskModelList() {
		return aiTaskQuery.findAiModelList(new CommonRequest<Void>(null));
	}
}

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

@@ -26,12 +26,6 @@ public interface AiAlarmManageService {
	CommonResponse<Map<String,Object>> queryOneAiAlarmInfo(@RequestParam String workTaskId) throws Exception;
	
	/**
	 * AI任务模型匹配下拉列表
	 * @return
	 */
	CommonResponse<List<AiModel>> queryAiTaskModelList();
	/**
	 * 根据 设备id 和 匹配模型 查询 AI任务
	 * @param resourceToolId 设备id
	 * @param aiIdenModel 匹配模型

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

@@ -0,0 +1,47 @@
package com.ai.bss.security.protection.service.interfaces;
import java.util.List;
import java.util.Map;
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.person.model.Organization;
import com.ai.bss.user.dto.EmployeeDto;
import com.ai.bss.user.dto.UserDto;
import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
public interface EmployeeManagementService {
	/**
	 * 人员列表分页查询
	 * @param request
	 * @return
	 * @throws Exception
	 */
	CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception;
	/**
	 * 创建人员
	 * @param employeeDto
	 * @return
	 * @throws Exception
	 */
	CommonResponse<Void> createWorkEmployee(EmployeeDto employeeDto) throws Exception;
	/**
	 * 删除人员
	 * @param params
	 * @return
	 */
	CommonResponse<Void> deleteWorkEmployee(Map<String, String> params);
	/**
	 * 修改人员
	 * @param employeeDto
	 * @return
	 */
	CommonResponse<Void> modifyWorkEmployee(EmployeeDto employeeDto);
}

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

@@ -82,4 +82,12 @@ public interface ResourceToolManageService {
	 * @throws Exception
	 */
	Map<String, String> uploadResourceToolPicture(MultipartFile meFile, String pictureUrl) throws Exception;
	
	/**
	 * 根据设备CODE获取场景、AI任务等相关信息
	 * @param resourceToolCode
	 * @return
	 */
	CommonResponse<List<Map<String, Object>>> getResourceToolAllInfo(String resourceToolCode);
	
}

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

@@ -4,6 +4,7 @@ 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.security.protection.model.AiQuery;
import com.ai.bss.work.safety.model.AiModel;
import com.ai.bss.work.safety.model.AiTask;
import com.ai.bss.work.task.model.common.WorkTask;
@@ -21,4 +22,9 @@ public interface SysConfigAiTaskService {
    CommonResponse<AiTask> modifyAiTask(AiTask aiTask);
    /**
	 * AI任务模型匹配下拉列表
	 * @return
	 */
	CommonResponse<List<AiModel>> queryAiTaskModelList();
}

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

@@ -3,7 +3,6 @@ package com.ai.bss.security.protection.service.task;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.kafka.annotation.KafkaListener;
@@ -67,7 +66,8 @@ public class AiResultRecordKafkaTask {
				throw new NullPointerException("resourceToolCode not exist");
			}
			String resourceToolId = String.valueOf(resourceToolMap.get("resourceToolId"));
			String resourceToolId = resourceToolMap.get("resourceToolId") == null ? ""
					: String.valueOf(resourceToolMap.get("resourceToolId"));
			CommonResponse<List<Map<String, Object>>> sceneTerminalRelResponse = monitorSceneQuery
					.selectSceneTerminalRel(new CommonRequest<Long>(Long.valueOf(resourceToolId)));
@@ -89,17 +89,18 @@ public class AiResultRecordKafkaTask {
			AiIdenLog aiIdenLog = JSON.parseObject(message, new TypeReference<AiIdenLog>() {
			});
			aiIdenLog.setResourceToolId(resourceToolId);
			aiIdenLog.setResourceToolName(
					StringUtils.defaultIfBlank(String.valueOf(resourceToolMap.get("resourceToolName")), ""));
			aiIdenLog.setMonitorSceneId(
					StringUtils.defaultIfBlank(String.valueOf(sceneTerminalRelMap.get("monitorSceneId")), ""));
			aiIdenLog.setMonitorSceneName(
					StringUtils.defaultIfBlank(String.valueOf(sceneTerminalRelMap.get("monitorSceneName")), ""));
			// aiIdenLog.setEffectType(StringUtils.defaultIfBlank(String.valueOf(sceneTerminalRelMap.get("effectType")),EbcConstant.TERMINAL_EFFECT_TYPE_OTH));
			aiIdenLog.setResourceToolName(resourceToolMap.get("resourceToolName") == null ? ""
					: String.valueOf(resourceToolMap.get("resourceToolName")));
			aiIdenLog.setMonitorSceneId(sceneTerminalRelMap.get("monitorSceneId") == null ? ""
					: String.valueOf(sceneTerminalRelMap.get("monitorSceneId")));
			aiIdenLog.setMonitorSceneName(sceneTerminalRelMap.get("monitorSceneName") == null ? ""
					: String.valueOf(sceneTerminalRelMap.get("monitorSceneName")));
			aiIdenLog.setEffectType(sceneTerminalRelMap.get("effectType") == null ? EbcConstant.TERMINAL_EFFECT_TYPE_OTH
					: String.valueOf(sceneTerminalRelMap.get("effectType")));
			aiIdenLog.setTerminalPosition(
					StringUtils.defaultIfBlank(String.valueOf(sceneTerminalRelMap.get("place")), ""));
					sceneTerminalRelMap.get("place") == null ? "" : String.valueOf(sceneTerminalRelMap.get("place")));
			aiIdenLog.setOrganizationId(
					StringUtils.defaultIfBlank(String.valueOf(sceneTerminalRelMap.get("orgId")), ""));
					sceneTerminalRelMap.get("orgId") == null ? "" : String.valueOf(sceneTerminalRelMap.get("orgId")));
			aiIdenLog.setAiTaskId(
					aiTaskMap.get("aiTaskId") == null ? 0L : Long.valueOf(String.valueOf(aiTaskMap.get("aiTaskId"))));