Browse Source

修改进出查询条件

konghl 4 years ago
parent
commit
6cf04c8967

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

42
				: attendanceReport.getPageSize();
42
				: attendanceReport.getPageSize();
43
43
44
		Map<String, Object> params = new HashMap<String, Object>();
44
		Map<String, Object> params = new HashMap<String, Object>();
45
		params.put("beginTime", attendanceReport.getBeginDay());
46
		params.put("endTime", attendanceReport.getEndDay());
47
		params.put("relateEmployeeNameAsLike", attendanceReport.getNameAsLike());
48
		params.put("aiIdenModel", EbcConstant.AI_MODEL_FACE);
49
		params.put("idenResultType", EbcConstant.AI_IDENTIFY_RESULT_ATTENDANCE);
45
		params.put("workOrgRoleId", attendanceReport.getOrgId());// 组织标识(部门ID)
46
		params.put("relateEmployeeRoleId", attendanceReport.getId());// 员工ID
47
		params.put("relateEmployeeName", attendanceReport.getName());// 员工名称(精确匹配)
48
		params.put("relateEmployeeNameAsLike", attendanceReport.getNameAsLike());// 员工名称(模糊匹配)
49
50
		params.put("resourceToolId", attendanceReport.getResourceToolId()); // 设备ID
51
		params.put("aiIdenModel", attendanceReport.getModelId()); // 匹配模型(如FACE)
52
		params.put("idenResultType", attendanceReport.getTypeId()); // 执行结果(如ATT)
53
54
		params.put("beginTime", attendanceReport.getBeginDay());// 执行时间(开始)
55
		params.put("endTime", attendanceReport.getEndDay());// 执行时间(结束)
50
56
51
		return aiIdenLogManageService.queryPageAiIdenLog(params, pageNumber, pageSize);
57
		return aiIdenLogManageService.queryPageAiIdenLog(params, pageNumber, pageSize);
52
	}
58
	}

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

1
package com.ai.bss.security.protection.controller;
1
package com.ai.bss.security.protection.controller;
2
2
3
3
4
import com.ai.abc.api.model.CommonResponse;
5
import com.ai.bss.components.common.model.PageBean;
6
import com.ai.bss.security.protection.model.AiQuery;
7
import com.ai.bss.security.protection.model.AttendanceReport;
8
import com.ai.bss.security.protection.service.interfaces.AiIdenLogManageService;
9
import com.ai.bss.security.protection.service.interfaces.AttendanceReportService;
10
import com.ai.bss.security.protection.service.interfaces.InAndOutRecordService;
11
import com.ai.bss.security.protection.utils.EbcConstant;
4
import java.util.HashMap;
5
import java.util.List;
6
import java.util.Map;
7
12
import org.slf4j.Logger;
8
import org.slf4j.Logger;
13
import org.slf4j.LoggerFactory;
9
import org.slf4j.LoggerFactory;
14
import org.springframework.beans.factory.annotation.Autowired;
10
import org.springframework.beans.factory.annotation.Autowired;
18
import org.springframework.web.bind.annotation.RequestParam;
14
import org.springframework.web.bind.annotation.RequestParam;
19
import org.springframework.web.bind.annotation.ResponseBody;
15
import org.springframework.web.bind.annotation.ResponseBody;
20
16
21
import java.util.HashMap;
22
import java.util.List;
23
import java.util.Map;
17
import com.ai.abc.api.model.CommonResponse;
18
import com.ai.bss.components.common.model.PageBean;
19
import com.ai.bss.security.protection.model.AttendanceReport;
20
import com.ai.bss.security.protection.service.interfaces.AiIdenLogManageService;
21
import com.ai.bss.security.protection.utils.EbcConstant;
24
22
25
/**
23
/**
26
 * 进出记录
24
 * 进出记录
54
		params.put("endTime", attendanceReport.getEndDay());
52
		params.put("endTime", attendanceReport.getEndDay());
55
		params.put("relateEmployeeNameAsLike", attendanceReport.getNameAsLike());
53
		params.put("relateEmployeeNameAsLike", attendanceReport.getNameAsLike());
56
		params.put("aiIdenModel",EbcConstant.AI_MODEL_FACE);
54
		params.put("aiIdenModel",EbcConstant.AI_MODEL_FACE);
55
		params.put("idenResultType",EbcConstant.AI_IDENTIFY_RESULT_ATTENDANCE);
57
56
58
		return aiIdenLogManageService.queryPageAiIdenLog(params, pageNumber, pageSize);
57
		return aiIdenLogManageService.queryPageAiIdenLog(params, pageNumber, pageSize);
59
	}
58
	}

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

25
    
25
    
26
    private String typeId; //类型
26
    private String typeId; //类型
27
    
27
    
28
    private String modelId; //模型
29
    
28
    private String workDay; //当前日期
30
    private String workDay; //当前日期
29
31
30
    private String month; //月份
32
    private String month; //月份
35
    
37
    
36
    private String monitorSceneType; //场景大类
38
    private String monitorSceneType; //场景大类
37
    
39
    
40
    private String resourceToolId; //设备ID
41
    
38
    int pageNumber = 0; // 当前页数
42
    int pageNumber = 0; // 当前页数
39
43
40
    int pageSize = 0; // 每页条数
44
    int pageSize = 0; // 每页条数