修改进出查询条件

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

@@ -42,11 +42,17 @@ public class AiIdenLogManageController {
				: attendanceReport.getPageSize();
		Map<String, Object> params = new HashMap<String, Object>();
		params.put("beginTime", attendanceReport.getBeginDay());
		params.put("endTime", attendanceReport.getEndDay());
		params.put("relateEmployeeNameAsLike", attendanceReport.getNameAsLike());
		params.put("aiIdenModel", EbcConstant.AI_MODEL_FACE);
		params.put("idenResultType", EbcConstant.AI_IDENTIFY_RESULT_ATTENDANCE);
		params.put("workOrgRoleId", attendanceReport.getOrgId());// 组织标识（部门ID）
		params.put("relateEmployeeRoleId", attendanceReport.getId());// 员工ID
		params.put("relateEmployeeName", attendanceReport.getName());// 员工名称（精确匹配）
		params.put("relateEmployeeNameAsLike", attendanceReport.getNameAsLike());// 员工名称（模糊匹配）
		params.put("resourceToolId", attendanceReport.getResourceToolId()); // 设备ID
		params.put("aiIdenModel", attendanceReport.getModelId()); // 匹配模型（如FACE）
		params.put("idenResultType", attendanceReport.getTypeId()); // 执行结果（如ATT）
		params.put("beginTime", attendanceReport.getBeginDay());// 执行时间（开始）
		params.put("endTime", attendanceReport.getEndDay());// 执行时间（结束）
		return aiIdenLogManageService.queryPageAiIdenLog(params, pageNumber, pageSize);
	}

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

@@ -1,14 +1,10 @@
package com.ai.bss.security.protection.controller;
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.service.interfaces.AiIdenLogManageService;
import com.ai.bss.security.protection.service.interfaces.AttendanceReportService;
import com.ai.bss.security.protection.service.interfaces.InAndOutRecordService;
import com.ai.bss.security.protection.utils.EbcConstant;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,9 +14,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
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;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.model.AttendanceReport;
import com.ai.bss.security.protection.service.interfaces.AiIdenLogManageService;
import com.ai.bss.security.protection.utils.EbcConstant;
/**
 * 进出记录
@@ -54,6 +52,7 @@ public class InAndOutRecordController {
		params.put("endTime", attendanceReport.getEndDay());
		params.put("relateEmployeeNameAsLike", attendanceReport.getNameAsLike());
		params.put("aiIdenModel",EbcConstant.AI_MODEL_FACE);
		params.put("idenResultType",EbcConstant.AI_IDENTIFY_RESULT_ATTENDANCE);
		return aiIdenLogManageService.queryPageAiIdenLog(params, pageNumber, pageSize);
	}

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

@@ -25,6 +25,8 @@ public class AttendanceReport implements Serializable {
    
    private String typeId; //类型
    
    private String modelId; //模型
    
    private String workDay; //当前日期
    private String month; //月份
@@ -35,6 +37,8 @@ public class AttendanceReport implements Serializable {
    
    private String monitorSceneType; //场景大类
    
    private String resourceToolId; //设备ID
    
    int pageNumber = 0; // 当前页数
    int pageSize = 0; // 每页条数