Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,67 @@
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.AttendanceReportService;
import com.ai.bss.security.protection.service.interfaces.InAndOutRecordService;
import com.ai.bss.security.protection.utils.EbcConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.HashMap;
import java.util.Map;
/**
 * 进出记录
 */
@Controller
@RequestMapping("/inAndOutRecord")
public class InAndOutRecordController {
	Logger logger = LoggerFactory.getLogger(InAndOutRecordController.class);
	@Autowired
	InAndOutRecordService inAndOutRecordService;
	/**
	 * 分页查询进出记录 （查询识别详情）
	 * @param  aiQuery
	 *                                workOrgRoleId: 组织标识
	 *                                aiIdenModel: AI识别模型
	 *                                relateEmployeeRoleId: 员工ID
	 *                                relateEmployeeName : 员工名称（精确匹配）
	 *                                relateEmployeeNameAsLike : 员工名称（模糊匹配）
	 *                                beginTime: 执行时间（开始）
	 *                                endTime: 执行时间（结束）
	 */
	@ResponseBody
	@RequestMapping("/queryPageInAndOutRecord")
	public CommonResponse<PageBean<Map<String,Object>>> queryPageInAndOutRecord(@ModelAttribute AiQuery aiQuery) throws Exception {
		// 当前页数
		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("relateEmployeeRoleId",aiQuery.getRelateEmployeeRoleId());
		params.put("relateEmployeeName",aiQuery.getRelateEmployeeName());
		params.put("relateEmployeeNameAsLike",aiQuery.getRelateEmployeeNameAsLike());
		params.put("beginTime",aiQuery.getBeginTime());
		params.put("endTime",aiQuery.getEndTime());
		CommonResponse<PageBean<Map<String,Object>>> commonResponse = inAndOutRecordService.queryPageInAndOutRecord(params, pageNumber, pageSize);
		return commonResponse;
	}
}

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

@@ -0,0 +1,38 @@
package com.ai.bss.security.protection.controller;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.security.protection.service.interfaces.UploadFileService;
@Controller
@RequestMapping("/uploadFile")
public class UploadFileController {
	@Autowired
	private UploadFileService uploadFileService;
	/**
	 * 上传设备照片
	 * @param meFile
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/getFileUrl")
	public CommonResponse<String> getFileUrl(@RequestParam String fileName) throws Exception {
		if (StringUtils.isEmpty(fileName)) {
			return CommonResponse.fail("501", "获取失败");
		}
		String minioFileUrl = uploadFileService.getFileUrl(fileName);
		return CommonResponse.ok(minioFileUrl);
	}
}

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

@@ -37,9 +37,9 @@ public class AiQuery {
    private String workEmployeeRoleId; // 处理人
    private String beginTime; // 报警开始时间
    private String beginTime; // 报警开始时间  执行时间（开始）
    private String endTime; // 报警结束时间
    private String endTime; // 报警结束时间  执行时间（结束）
    private String workOrgRoleId; // 组织ID
@@ -48,4 +48,12 @@ public class AiQuery {
    private String workTaskId; // 任务ID
    private String processMemo; // 处理详情必选
    private String relateEmployeeRoleId; // 员工ID
    private String relateEmployeeName; // 员工名称（精确匹配）
    private String relateEmployeeNameAsLike; // 员工名称（模糊匹配）
}

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

@@ -0,0 +1,65 @@
package com.ai.bss.security.protection.service.impl;
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.InAndOutRecordService;
import com.ai.bss.user.dto.EmployeeDto;
import com.ai.bss.user.service.api.EmployeeService;
import com.ai.bss.work.safety.service.api.AiTaskQuery;
import org.apache.bcel.verifier.statics.LONG_Upper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
 * @Auther: 王超
 * @Date: 2020/12/15 14:34
 * @Description:
 */
@Service
public class InAndOutRecordServiceImpl implements InAndOutRecordService {
    @Autowired
    AiTaskQuery aiTaskQuery;
    @Autowired
    EmployeeService employeeService;
    @Override
    public CommonResponse<PageBean<Map<String, Object>>> queryPageInAndOutRecord(Map<String, Object> params, int pageNumber, int pageSize) {
        CommonResponse<PageBean<Map<String, Object>>> queryResult = aiTaskQuery.queryAiIdenLog(new CommonRequest<>(params, pageNumber, pageSize));
        List<Map<String, Object>> inAndOutRecordList = queryResult.getData().getData();
        if(null!=inAndOutRecordList&&inAndOutRecordList.size()>0){
            inAndOutRecordList.forEach((inAndOutRecord)->{
                if(null!=inAndOutRecord.get("relateEmployeeRoleId")){
                    long relateEmployeeRoleId = Long.parseLong((String) inAndOutRecord.get("relateEmployeeRoleId"));
                    EmployeeDto employeeDto = new EmployeeDto();
                    employeeDto.setId(relateEmployeeRoleId);
                    CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
                    CommonResponse<EmployeeDto> response = employeeService.queryEmployee(request);
                    EmployeeDto employee = response.getData();
                    if(employee!=null){
                        inAndOutRecord.put("headerUrl", employee.getHeaderUrl());
                        inAndOutRecord.put("name", employee.getName());
                        inAndOutRecord.put("mainJobPosition", employee.getMainJobPosition());
                        inAndOutRecord.put("orgName", employee.getOrgName());
                        inAndOutRecord.put("organizeCode", employee.getOrganizeCode());
                        inAndOutRecord.put("code", employee.getCode());
                    }
                }
            });
        }
        return queryResult;
    }
}

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

@@ -91,7 +91,7 @@ public class UploadFileServiceImpl implements UploadFileService {
	}
	@Override
	public List<Map<String, Object>> getFileUrl(List<Map<String, Object>> minioFileListMap, String mapkey,
	public List<Map<String, Object>> getFileUrlForListMap(List<Map<String, Object>> minioFileListMap, String mapkey,
			String minioFileUrlKey) throws Exception {
		if (CollectionUtils.isEmpty(minioFileListMap)) {
			log.debug("批量获取文件的url为空");
@@ -100,11 +100,11 @@ public class UploadFileServiceImpl implements UploadFileService {
		String minioFileName = String.valueOf(minioFileListMap.get(0).get(mapkey));
		return getFileUrl(minioFileListMap, mapkey, minioFileUrlKey, getBucketName(minioFileName));
		return getFileUrlForListMap(minioFileListMap, mapkey, minioFileUrlKey, getBucketName(minioFileName));
	}
	@Override
	public List<Map<String, Object>> getFileUrl(List<Map<String, Object>> minioFileListMap, String mapkey,
	public List<Map<String, Object>> getFileUrlForListMap(List<Map<String, Object>> minioFileListMap, String mapkey,
			String minioFileUrlKey, String bucketName) throws Exception {
		if (CollectionUtils.isEmpty(minioFileListMap)) {
			log.debug("批量获取文件的url为空");

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

@@ -0,0 +1,11 @@
package com.ai.bss.security.protection.service.interfaces;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import java.util.Map;
public interface InAndOutRecordService {
    CommonResponse<PageBean<Map<String, Object>>> queryPageInAndOutRecord(Map<String, Object> params, int pageNumber, int pageSize);
}

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

@@ -31,24 +31,27 @@ public interface UploadFileService {
	/**
	 * 批量获取文件的url地址
	 * @param minioFileListMap
	 * @param mapkey
	 * @param minioFileUrlKey
	 * @param minioFileListMap 数据列表
	 * @param mapkey 数据列表中minioFileName的key
	 * @param minioFileUrlKey 数据列表中minioFileUrl的key
	 * @return
	 * @throws Exception
	 */
	List<Map<String,Object>> getFileUrl(List<Map<String,Object>> minioFileListMap,String mapkey,String minioFileUrlKey) throws Exception;
	
	List<Map<String, Object>> getFileUrlForListMap(List<Map<String, Object>> minioFileListMap, String mapkey,
			String minioFileUrlKey) throws Exception;
	/**
	 * 批量获取文件的url地址
	 * @param minioFileListMap
	 * @param key
	 * @param bucketName
	 * @param minioFileListMap 数据列表
	 * @param mapkey 数据列表中minioFileName的key
	 * @param minioFileUrlKey 数据列表中minioFileUrl的key
	 * @param bucketName 存储文件的桶名(文件夹)
	 * @return
	 * @throws Exception
	 */
	List<Map<String,Object>> getFileUrl(List<Map<String,Object>> minioFileListMap,String mapkey,String minioFileUrlKey, String bucketName) throws Exception;
	
	List<Map<String, Object>> getFileUrlForListMap(List<Map<String, Object>> minioFileListMap, String mapkey,
			String minioFileUrlKey, String bucketName) throws Exception;
	/**
	 * 移除文件
	 * @param minioFileName minio文件标识