修改员工列表返回的格式

location-rescue-service/src/main/java/com/ai/bss/location/rescue/controller/WorkEmployeeController.java

@@ -34,7 +34,7 @@ public class WorkEmployeeController {
     */
    @ResponseBody
    @RequestMapping("/queryWorkEmployee")
    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(@RequestBody CommonRequest<UserDto> request) throws Exception {
    public CommonResponse<PageBean<Map<String, Object>>> queryWorkEmployee(@RequestBody CommonRequest<UserDto> request) throws Exception {
		/*UserDto userDto = new UserDto();
		userDto.setOrgId(params.get("orgId"));
		userDto.setCode(params.get("code"));

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/WorkEmployeeServiceImpl.java

@@ -43,7 +43,7 @@ public class WorkEmployeeServiceImpl implements WorkEmployeeService {
	private CharSpecService charSpecService;
	@Override
	public CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception {
	public CommonResponse<PageBean<Map<String, Object>>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception {
		// TODO 组织编码
		// request.getData().setOrgCode("0000");
		return userDtoQuery.queryWorkEmployee(request);

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/interfaces/WorkEmployeeService.java

@@ -20,7 +20,7 @@ public interface WorkEmployeeService {
	 * @return
	 * @throws Exception
	 */
	CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception;
	CommonResponse<PageBean<Map<String, Object>>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception;
	CommonResponse<List<Organization>> queryAllOrganize(CommonRequest<Organization> params) throws Exception;

location-rescue-service/src/main/resources/application.properties

@@ -23,6 +23,7 @@ spring.main.allow-bean-definition-overriding=true
#kafka
#kafka.bootstrap-servers=47.105.160.21:9090
#http://10.19.90.34:8187/mock/startMackData?sId=99&f=5&topic0=DeviceLocationKong&topic1=IndividualAlarmKong
kafka.bootstrap-servers=10.19.90.34:9090
kafka.topic.deviceLocation=Topic_IoT_DeviceLocation
kafka.topic.alarm=Topic_IoT_IndividualAlarm

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

@@ -0,0 +1,97 @@
package com.ai.bss.security.protection.controller;
import java.util.HashMap;
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.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
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.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;
@Controller
@RequestMapping("/aiIdenLogManagement")
public class AiIdenLogManageController {
	@Autowired
	private AiIdenLogManageService aiIdenLogManageService;
	/**
	 * 分页查询AI执行结果信息
	 * @param attendanceReport
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryPageAiIdenLog")
	public CommonResponse<PageBean<Map<String, Object>>> queryPageAiIdenLog(
			@ModelAttribute AttendanceReport attendanceReport) throws Exception {
		// 当前页数
		int pageNumber = attendanceReport.getPageNumber() < 1 ? 1 : attendanceReport.getPageNumber();
		// 每页条数
		int pageSize = attendanceReport.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE
				: 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);
		return aiIdenLogManageService.queryPageAiIdenLog(params, pageNumber, pageSize);
	}
	/**
	 * 查询所有AI执行结果的图片列表
	 * @param attendanceReport
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryAllAiIdenLogPicture")
	public CommonResponse<List<Map<String, Object>>> queryAllAiIdenLogPicture(
			@ModelAttribute AttendanceReport attendanceReport) throws Exception {
		if (StringUtils.isEmpty(attendanceReport.getId())) {
			return CommonResponse.fail("504", "查询失败");
		}
		// 当前页数
		int pageNumber = attendanceReport.getPageNumber() < 1 ? 1 : attendanceReport.getPageNumber();
		// 每页条数
		int pageSize = attendanceReport.getPageSize() < 1 ? 10 : attendanceReport.getPageSize();
		Map<String, Object> params = new HashMap<String, Object>();
		params.put("beginTime", attendanceReport.getBeginDay());
		params.put("endTime", attendanceReport.getEndDay());
		params.put("resourceToolId", attendanceReport.getId());
		params.put("aiIdenModel", EbcConstant.AI_MODEL_CLOTHING_CODE);
		return aiIdenLogManageService.queryAllAiIdenLogPicture(params, pageNumber, pageSize);
	}
	/**
	 * 查询单个AI执行结果详情
	 * @param aiIdenLogId
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryOneAiIdenLog")
	public CommonResponse<Map<String, Object>> queryOneAiIdenLog(@RequestParam Long aiIdenLogId) throws Exception {
		if (aiIdenLogId == null) {
			return CommonResponse.fail("500", "查询失败");
		}
		return aiIdenLogManageService.queryOneAiIdenLog(aiIdenLogId);
	}
}

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

@@ -43,7 +43,7 @@ public class AttendanceCommonController {
     */
    @ResponseBody
    @RequestMapping("/queryWorkEmployee")
    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(@RequestBody CommonRequest<UserDto> request) throws Exception {
    public CommonResponse<PageBean<Map<String, Object>>> queryWorkEmployee(@RequestBody CommonRequest<UserDto> request) throws Exception {
        return attendanceCommonService.queryWorkEmployee(request);
    }

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

@@ -25,6 +25,8 @@ import com.ai.bss.user.dto.UserDto;
/**
 * 用户信息
 * @author konghl@asiainfo.com
 * 2020-12-24
 */
@Controller
@RequestMapping("/employeeManagement")
@@ -41,7 +43,7 @@ public class EmployeeManagementController {
	 */
	@ResponseBody
	@RequestMapping("/queryEmployeeList")
	public CommonResponse<PageBean<UserDto>> queryEmployeeList(@ModelAttribute AttendanceReport attendanceReport)
	public CommonResponse<PageBean<Map<String, Object>>> queryEmployeeList(@ModelAttribute AttendanceReport attendanceReport)
			throws Exception {
		// 当前页数
		int pageNumber = attendanceReport.getPageNumber() < 1 ? 1 : attendanceReport.getPageNumber();
@@ -50,9 +52,8 @@ public class EmployeeManagementController {
				: attendanceReport.getPageSize();
		UserDto userDto = new UserDto();
		if (StringUtils.isNotEmpty(attendanceReport.getOrgId())) {
			userDto.setOrgId(attendanceReport.getOrgId());
		}
		userDto.setOrgId(attendanceReport.getOrgId());
		userDto.setId(attendanceReport.getId());
		return employeeManagementService.queryEmployeeList(userDto, pageNumber, pageSize);
	}
@@ -203,4 +204,29 @@ public class EmployeeManagementController {
		return employeeManagementService.queryCycleChildOrg(orgId);
	}
	/**
	 * 根据部门ID查询下级及下下级部门的员工列表
	 * @param orgId
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryEmployeeListByOrgId")
	public CommonResponse<List<Map<String, Object>>> queryEmployeeListByOrgId(
			@RequestParam(required = false) Long orgId) throws Exception {
		if (orgId == null || orgId < 0) {
			return CommonResponse.ok(new ArrayList<Map<String, Object>>());
		}
		// 当前页数
		int pageNumber = 1;
		// 每页条数
		int pageSize = EbcConstant.COMBOBOX_MAXNUM;
		List<Map<String, Object>> resultList = employeeManagementService.queryEmployeeListByOrgId(orgId, pageNumber,
				pageSize);
		return CommonResponse.ok(resultList);
	}
}

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/InAndOutRecordController.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.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;
@@ -14,6 +15,7 @@ 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.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.HashMap;
@@ -28,40 +30,47 @@ public class InAndOutRecordController {
	Logger logger = LoggerFactory.getLogger(InAndOutRecordController.class);
	@Autowired
	InAndOutRecordService inAndOutRecordService;
	private AiIdenLogManageService aiIdenLogManageService;
	/**
	 * 分页查询进出记录 （查询识别详情）
	 * @param  aiQuery
	 *                                workOrgRoleId: 组织标识
	 *                                aiIdenModel: AI识别模型
	 *                                relateEmployeeRoleId: 员工ID
	 *                                relateEmployeeName : 员工名称（精确匹配）
	 *                                relateEmployeeNameAsLike : 员工名称（模糊匹配）
	 *                                beginTime: 执行时间（开始）
	 *                                endTime: 执行时间（结束）
	 * 分页查询进出记录
	 * @param attendanceReport
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryPageInAndOutRecord")
	public CommonResponse<PageBean<Map<String,Object>>> queryPageInAndOutRecord(@ModelAttribute AiQuery aiQuery) throws Exception {
	public CommonResponse<PageBean<Map<String, Object>>> queryPageInAndOutRecord(
			@ModelAttribute AttendanceReport attendanceReport) throws Exception {
		// 当前页数
		int pageNumber = aiQuery.getPageNumber() < 1 ? 1 : aiQuery.getPageNumber();
		int pageNumber = attendanceReport.getPageNumber() < 1 ? 1 : attendanceReport.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());
		int pageSize = attendanceReport.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE
				: attendanceReport.getPageSize();
		CommonResponse<PageBean<Map<String,Object>>> commonResponse = inAndOutRecordService.queryPageInAndOutRecord(params, pageNumber, pageSize);
		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);
		return aiIdenLogManageService.queryPageAiIdenLog(params, pageNumber, pageSize);
	}
		return commonResponse;
	/**
	 * 查询单个识别详情
	 * @param aiIdenLogId
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryOneInAndOutRecord")
	public CommonResponse<Map<String, Object>> queryOneInAndOutRecord(@RequestParam Long aiIdenLogId) throws Exception {
		if (aiIdenLogId == null) {
			return CommonResponse.fail("500", "查询失败");
		}
		return aiIdenLogManageService.queryOneAiIdenLog(aiIdenLogId);
	}
}

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

@@ -13,6 +13,8 @@ public class AttendanceReport implements Serializable {
    private  String code; //编号
    
    private  String name; //名称
    
    private  String nameAsLike; //姓名（模糊）
    private  String orgId; //组织id

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

@@ -0,0 +1,245 @@
package com.ai.bss.security.protection.service.impl;
import java.util.ArrayList;
import java.util.HashMap;
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;
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.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;
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.safety.model.AiIdenLog;
import com.ai.bss.work.safety.service.api.AiTaskCommand;
import com.ai.bss.work.safety.service.api.AiTaskQuery;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.TypeReference;
@Service
public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
	@Autowired
	private AiTaskQuery aiTaskQuery;
	@Autowired
	private AiTaskCommand aiTaskCommand;
	@Autowired
	private CharSpecService charSpecService;
	@Autowired
	private EmployeeService employeeService;
	@Autowired
	private UploadFileService uploadFileService;
	@Autowired
	private MonitorVideoLogManageService monitorVideoLogManageService;
	@Override
	public CommonResponse<PageBean<Map<String, Object>>> queryPageAiIdenLog(Map<String, Object> params, int pageNumber,
			int pageSize) throws Exception {
		CommonRequest<Map<String, Object>> conditionMapRequest = new CommonRequest<Map<String, Object>>(params,
				pageNumber, pageSize);
		CommonResponse<PageBean<Map<String, Object>>> response = aiTaskQuery.queryAiIdenLog(conditionMapRequest);
		if (response == null || response.getData() == null || CollectionUtils.isEmpty(response.getData().getData())) {
			return response;
		}
		Map<String, String> allPositionTypeMap = charSpecService
				.getCharSpecMap(EbcConstant.BUSINESS_SPEC_EMPLOYEE_POSITION);
		for (Map<String, Object> dataMap : response.getData().getData()) {
			dataMap.put("taskExecuteTime", DateUtil.formatObjectToDate(dataMap.get("taskExecuteTime")));
			dataMap.put("idenPictureSnapDate", DateUtil.formatObjectToDate(dataMap.get("idenPictureSnapDate")));
			
			// 结果详情
			String idenResultArr = dataMap.get("idenResult") == null ? "" : String.valueOf(dataMap.get("idenResult"));
			if (StringUtils.isNotEmpty(idenResultArr)) {
				List<Map<String, String>> idenResultList = JSONArray.parseObject(idenResultArr, 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> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
				CommonResponse<EmployeeDto> employeeResponse = employeeService.queryEmployee(request);
				if (employeeResponse.getData() != null) {
					dataMap.put("employeeName", employeeResponse.getData().getName());
					dataMap.put("employeeCode", employeeResponse.getData().getCode());
					dataMap.put("companyName", employeeResponse.getData().getField4());
					dataMap.put("organizationCode", employeeResponse.getData().getOrganizeCode());
					dataMap.put("organizationName", employeeResponse.getData().getOrgName());
					String employeePosition = employeeResponse.getData().getMainJobPosition();
					dataMap.put("employeePosition", employeePosition);
					dataMap.put("employeePositionZh", allPositionTypeMap.get(employeePosition));
				}
			}
		}
		return response;
	}
	@Override
	public CommonResponse<List<Map<String, Object>>> queryAllAiIdenLogPicture(Map<String, Object> params,
			int pageNumber, int pageSize) throws Exception {
		CommonRequest<Map<String, Object>> conditionMapRequest = new CommonRequest<Map<String, Object>>(params,
				pageNumber, pageSize);
		CommonResponse<PageBean<Map<String, Object>>> response = aiTaskQuery.queryAiIdenLog(conditionMapRequest);
		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
		if (response == null || response.getData() == null || CollectionUtils.isEmpty(response.getData().getData())) {
			return CommonResponse.ok(list);
		}
		for (Map<String, Object> dataMap : response.getData().getData()) {
			/*Map<String, String> pictureMap = uploadFileService.getFileUrlToMap(String.valueOf(dataMap.get("idenPictureUrl")));
			
			if (!CollectionUtils.isEmpty(pictureMap)) {
				Map<String, Object> map = new HashMap<String, Object>();
				map.putAll(pictureMap);
				map.put("aiIdenLogId", dataMap.get("aiIdenLogId"));
				map.put("idenPictureUrl", dataMap.get("idenPictureUrl"));
				list.add(map);
			}*/
			String pictureUrl = String.valueOf(dataMap.get("idenPictureUrl"));
			if (pictureUrl.length() > 20 && pictureUrl.lastIndexOf(".") > 18
					&& pictureUrl.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE) > 0) {
				
				int picturePrefixIndex = pictureUrl.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE)
						+ EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE.length();
				String fileName = pictureUrl.substring(picturePrefixIndex, picturePrefixIndex + 4) + "-"
						+ pictureUrl.substring(picturePrefixIndex + 4, picturePrefixIndex + 6) + "-"
						+ pictureUrl.substring(picturePrefixIndex + 6, picturePrefixIndex + 8);
				Map<String, Object> map = new HashMap<String, Object>();
				map.put("aiIdenLogId", dataMap.get("aiIdenLogId"));
				map.put("idenPictureUrl", pictureUrl);
				map.put("fileName", fileName);
				list.add(map);
			}
		}
		return CommonResponse.ok(list);
	}
	@Override
	public CommonResponse<Map<String, Object>> queryOneAiIdenLog(Long aiIdenLogId) throws Exception {
		CommonRequest<Long> aiIdenLogIdRequest = new CommonRequest<Long>(aiIdenLogId);
		CommonResponse<AiIdenLog> response = aiTaskQuery.loadAiIdenLog(aiIdenLogIdRequest);
		if (response == null || response.getData() == null) {
			return CommonResponse.fail("504", "未查到相关信息");
		}
		AiIdenLog aiIdenLog = response.getData();
		Map<String, String> aiIdenLogInfoMap = JSON.parseObject(JSON.toJSONString(aiIdenLog),
				new TypeReference<Map<String, String>>() {
				});
		// 结果详情
		if (StringUtils.isNotEmpty(aiIdenLog.getIdenResult())) {
			List<Map<String, String>> idenResultList = JSONArray.parseObject(aiIdenLog.getIdenResult(), List.class);
			if (!CollectionUtils.isEmpty(idenResultList)) {
				aiIdenLogInfoMap.putAll(idenResultList.get(0));
			}
		}
		// 员工信息
		if (StringUtils.isNotEmpty(aiIdenLog.getRelateEmployeeRoleId())) {
			long relateEmployeeRoleId = Long.parseLong(aiIdenLog.getRelateEmployeeRoleId());
			EmployeeDto employeeDto = new EmployeeDto();
			employeeDto.setId(relateEmployeeRoleId);
			CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
			CommonResponse<EmployeeDto> employeeResponse = employeeService.queryEmployee(request);
			if (employeeResponse.getData() != null) {
				aiIdenLogInfoMap.put("employeeName", employeeResponse.getData().getName());
				aiIdenLogInfoMap.put("employeeCode", employeeResponse.getData().getCode());
				/*
				String employeePosition = employeeResponse.getData().getMainJobPosition();
				aiIdenLogInfoMap.put("employeePosition", employeePosition);
				List<CharacteristicSpecValue> allPositionTypeList = charSpecService
						.getCharSpecList(EbcConstant.BUSINESS_SPEC_EMPLOYEE_POSITION);
				for (CharacteristicSpecValue characteristicSpecValue : allPositionTypeList) {
					if (characteristicSpecValue.getCode().equals(employeePosition)) {
						aiIdenLogInfoMap.put("employeePositionZh", characteristicSpecValue.getValue());
						break;
					}
				}
				
				aiIdenLogInfoMap.put("companyName", employeeResponse.getData().getField4());
				aiIdenLogInfoMap.put("organizationCode", employeeResponse.getData().getOrganizeCode());
				aiIdenLogInfoMap.put("organizationName", employeeResponse.getData().getOrgName());
				*/
			}
		}
		// 图片信息
		Map<String, String> pictureMap = uploadFileService.getFileUrlToMap(aiIdenLog.getIdenPictureUrl());
		// 视频信息
		List<EbcMonitorVideoLog> logsList = monitorVideoLogManageService
				.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), aiIdenLog.getResourceToolId())
				.getData();
		EbcMonitorVideoLog ebcMonitorVideoLog = null;
		if (!CollectionUtils.isEmpty(logsList)) {
			ebcMonitorVideoLog = logsList.get(0);
			ebcMonitorVideoLog.setVideoFileUrl(uploadFileService.getFileUrl(ebcMonitorVideoLog.getVideoUrl()));
		}
		Map<String, Object> resultMap = new HashMap<String, Object>();
		resultMap.put("alarmInfo", aiIdenLogInfoMap);
		resultMap.put("pictureInfo", pictureMap);
		resultMap.put("videoInfo", ebcMonitorVideoLog);
		return CommonResponse.ok(resultMap);
	}
	@Override
	public CommonResponse<AiIdenLog> createAiIdenLog(AiIdenLog aiIdenLog) throws Exception {
		CommonRequest<AiIdenLog> aiIdenLogRequest = new CommonRequest<AiIdenLog>(aiIdenLog);
		return aiTaskCommand.createAiIdenLog(aiIdenLogRequest);
	}
	@Override
	public CommonResponse<AiIdenLog> modifyAiIdenLog(AiIdenLog aiIdenLog) throws Exception {
		CommonRequest<AiIdenLog> aiIdenLogRequest = new CommonRequest<AiIdenLog>(aiIdenLog);
		return aiTaskCommand.modifyAiIdenLog(aiIdenLogRequest);
	}
	@Override
	public CommonResponse<Void> deleteAiIdenLog(List<Long> aiIdenLogIdList) throws Exception {
		CommonRequest<List<Long>> aiIdenLogIdListRequest = new CommonRequest<List<Long>>(aiIdenLogIdList);
		return aiTaskCommand.deleteAiIdenLog(aiIdenLogIdListRequest);
	}
}

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

@@ -31,7 +31,7 @@ public class AttendanceCommonServiceImpl implements AttendanceCommonService {
    private EmployeeService employeeService;
    @Override
    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(Map<String, Object> params)  {
    public CommonResponse<PageBean<Map<String, Object>>> queryWorkEmployee(Map<String, Object> params)  {
        String orgCode = (!(params.get("orgCode") == null || "".equals(params.get("orgCode")))) ? (String) params.get("orgCode") : null;
        String orgId = (!(params.get("orgId") == null || "".equals(params.get("orgId")))) ? (String) params.get("orgId") : null;
        String employeeId = (!(params.get("employeeId") == null || "".equals(params.get("employeeId")))) ? (String) params.get("employeeId") : null;
@@ -50,7 +50,7 @@ public class AttendanceCommonServiceImpl implements AttendanceCommonService {
    }
    @Override
    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception {
    public CommonResponse<PageBean<Map<String, Object>>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception {
        // TODO 组织编码
        //request.getData().setOrgCode("0000");
        return userDtoQuery.queryWorkEmployee(request);

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

@@ -1,5 +1,6 @@
package com.ai.bss.security.protection.service.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -8,6 +9,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import com.ai.abc.api.model.CommonRequest;
@@ -19,6 +21,7 @@ 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.service.interfaces.UploadFileService;
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;
@@ -36,7 +39,7 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
	@Autowired
	private EmployeeService employeeService;
	
	@Autowired
	private UploadFileService uploadFileService;
@@ -47,29 +50,60 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
	private CharSpecService charSpecService;
	@Override
	public CommonResponse<PageBean<UserDto>> queryEmployeeList(UserDto userDto,int pageNumber,int pageSize) throws Exception {
		CommonRequest<UserDto> request=new CommonRequest<UserDto>(userDto,pageNumber, pageSize);
		return userDtoQuery.queryWorkEmployee(request);
	public CommonResponse<PageBean<Map<String, Object>>> queryEmployeeList(UserDto userDto, int pageNumber, int pageSize)
			throws Exception {
		CommonRequest<UserDto> request = new CommonRequest<UserDto>(userDto, pageNumber, pageSize);
		CommonResponse<PageBean<Map<String, Object>>> response = userDtoQuery.queryWorkEmployee(request);
		if (response == null || response.getData() == null || CollectionUtils.isEmpty(response.getData().getData())) {
			return response;
		}
		Map<String, String> allPositionTypeMap = charSpecService
				.getCharSpecMap(EbcConstant.BUSINESS_SPEC_EMPLOYEE_POSITION);
		for (Map<String, Object> dataMap : response.getData().getData()) {
			dataMap.put("userPositionZh", allPositionTypeMap.get(String.valueOf(dataMap.get("mainJobPosition"))));
			
			
			
			
			
			
			
		}
		
		return response;
	}
	@Override
	public CommonResponse<EmployeeDto> queryOneEmployee(Long employeeId) throws Exception{
		// TODO Auto-generated method stub
		return null;
	public CommonResponse<EmployeeDto> queryOneEmployee(Long employeeId) throws Exception {
		EmployeeDto employeeDto = new EmployeeDto();
		employeeDto.setId(employeeId);
		CommonRequest<EmployeeDto> request = new CommonRequest<EmployeeDto>(employeeDto);
		CommonResponse<EmployeeDto> response = employeeService.queryEmployee(request);
		if (response == null || response.getData() == null) {
			return response;
		}
		return response;
	}
	
	@Override
	public CommonResponse<Void> createEmployee(EmployeeDto employeeDto) throws Exception {
		CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
		employeeDto.setField2(EbcConstant.AUDIT_STATUS_INI);
		CommonRequest<EmployeeDto> request = new CommonRequest<EmployeeDto>(employeeDto);
		return employeeService.createWorkEmployee(request);
	}
	@Override
	public CommonResponse<Void> modifyEmployee(EmployeeDto employeeDto) {
		employeeDto.setField2(EbcConstant.AUDIT_STATUS_INI);
		CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
		return employeeService.modifyEmployee(request);
	}
	
	@Override
	public CommonResponse<Void> deleteEmployee(String employeeId) {
		boolean success = true;
@@ -94,21 +128,21 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
	@Override
	public Map<String, String> uploadEmployeePicture(MultipartFile meFile, String pictureUrl) throws Exception {
		/*if (StringUtils.isNotBlank(pictureUrl) && !"#".equals(pictureUrl)) {
	 	//删除照片
		uploadFileService.removeFile(pictureUrl, minioConfig.getBucketToolImage());
	}*/
		 	//删除照片
			uploadFileService.removeFile(pictureUrl, minioConfig.getBucketToolImage());
		}*/
	// 上传
	String minioFileName = uploadFileService.uploadFile(meFile, minioConfig.getBucketHeaderImage());
		// 上传
		String minioFileName = uploadFileService.uploadFile(meFile, minioConfig.getBucketHeaderImage());
	// 获取照片的url地址
	String toolPictureUrl = uploadFileService.getFileUrl(minioFileName, minioConfig.getBucketHeaderImage());
		// 获取照片的url地址
		String toolPictureUrl = uploadFileService.getFileUrl(minioFileName, minioConfig.getBucketHeaderImage());
	// 返回信息
	Map<String, String> resultMap = new HashMap<String, String>();
	resultMap.put("pictureUrl", minioFileName);
	resultMap.put("toolPictureUrl", toolPictureUrl);
	return resultMap;
		// 返回信息
		Map<String, String> resultMap = new HashMap<String, String>();
		resultMap.put("pictureUrl", minioFileName);
		resultMap.put("toolPictureUrl", toolPictureUrl);
		return resultMap;
	}
	@Override
@@ -116,17 +150,57 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
		// TODO Auto-generated method stub
		return null;
	}
	
	@Override
	public CommonResponse<List<Organization>> queryChildOrgById(Long orgId) {
		CommonRequest<Long> organize=new CommonRequest<Long>(orgId);
		CommonRequest<Long> organize = new CommonRequest<Long>(orgId);
		return organizationQuery.querySubOrgByOrgId(organize);
	}
	@Override
	public CommonResponse<List<Organization>> queryCycleChildOrg(Long orgId) {
		CommonRequest<Long> organize=new CommonRequest<Long>(orgId);
		return organizationQuery.queryAllSubOrgByOrgId(organize);
		CommonRequest<Long> request = new CommonRequest<Long>(orgId);
		CommonResponse<Organization> orgParentResponse = organizationQuery.queryOrganizationById(request);
		if (orgParentResponse == null || !orgParentResponse.isSuccess() || orgParentResponse.getData() == null) {
			return CommonResponse.fail("504", "获取部门失败");
		}
		CommonResponse<List<Organization>> response = organizationQuery.queryAllSubOrgByOrgId(request);
		if (response == null || CollectionUtils.isEmpty(response.getData())) {
			return response;
		}
		String orgParentCode = orgParentResponse.getData().getCode();
		response.getData().forEach(org -> {
			if (orgParentCode.equals(org.getParentCode())) {
				org.setParentCode("-1");
			}
		});
		return response;
	}
	@Override
	public List<Map<String, Object>> queryEmployeeListByOrgId(Long orgId, int pageNumber, int pageSize) {
		CommonRequest<Long> request = new CommonRequest<Long>(orgId);
		CommonResponse<Organization> orgResponse = organizationQuery.queryOrganizationById(request);
		if (orgResponse == null || !orgResponse.isSuccess() || orgResponse.getData() == null) {
			return new ArrayList<Map<String, Object>>();
		}
		Map<String, Object> requestMap = new HashMap<String, Object>();
		requestMap.put("orgCode", orgResponse.getData().getCode());
		CommonRequest<Map<String, Object>> conditionMapRequest = new CommonRequest<Map<String, Object>>(requestMap,
				pageNumber, pageSize);
		CommonResponse<PageBean<Map<String, Object>>> response = employeeService
				.queryIndividualList(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/MonitorVideoLogManageServiceImpl.java

@@ -31,7 +31,7 @@ import com.ai.bss.work.safety.service.api.MonitorSceneQuery;
@Service
public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageService {
	public String SPLIT_CHAR  = "_";
	public String SPLIT_CHAR = "_";
	@Autowired
	private MonitorSceneQuery monitorSceneQuery;
@@ -42,7 +42,6 @@ public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageSe
	@Autowired
	private UploadFileService uploadFileService;
	@Autowired
	private SecurityProtectionMinioConfig minioConfig;
@@ -65,10 +64,9 @@ public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageSe
		return CommonResponse.ok(list);
	}
	@Override
	public CommonResponse<String> queryMonitorVideoLogByTimeForM3u8(MonitorVideoLog monitorVideoLogCondition) throws Exception {
	public CommonResponse<String> queryMonitorVideoLogByTimeForM3u8(MonitorVideoLog monitorVideoLogCondition)
			throws Exception {
		CommonRequest<MonitorVideoLog> request = new CommonRequest<MonitorVideoLog>(monitorVideoLogCondition);
		CommonResponse<List<MonitorVideoLog>> response = monitorSceneQuery.queryMonitorVideoLogByTime(request);
@@ -77,13 +75,12 @@ public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageSe
			return CommonResponse.ok(null);
		}
		StringBuffer m3u8Str = new StringBuffer();
		m3u8Str.append("#EXTM3U").append("\n");
		m3u8Str.append("#EXT-X-VERSION:3").append("\n");
		m3u8Str.append("#EXT-X-TARGETDURATION:65").append("\n");
		m3u8Str.append("#EXT-X-MEDIA-SEQUENCE:0").append("\n");
		String bucketName = minioConfig.getBucketM3U8();//"m3u8-index";
		String bucketName = minioConfig.getBucketM3U8();// "m3u8-index";
		String fileType = ".m3u8";
		String m3u8FileName = bucketName + SPLIT_CHAR + UUID.fastUUID().toString().replace("-", "") + fileType;
@@ -98,7 +95,7 @@ public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageSe
		}
		m3u8Str.append("#EXT-X-ENDLIST").append("\n");
		InputStream is = new ByteArrayInputStream(m3u8Str.toString().getBytes());
		minioService.putObject(bucketName,m3u8FileName,is,fileType);
		minioService.putObject(bucketName, m3u8FileName, is, fileType);
		String m3u8IndexFileUrl = uploadFileService.getFileUrl(m3u8FileName);
@@ -160,10 +157,9 @@ public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageSe
		String fileType = videoUrl.substring(videoUrl.lastIndexOf(".") + 1);
		String newFileName = videoUrl.substring(videoUrl.lastIndexOf("_") + 1);
		int videoPrefixIndex = newFileName.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO);
		String fileNameData = newFileName.substring(
				videoPrefixIndex + EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO.length(),
				videoPrefixIndex + EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO.length() + 14);
		int videoPrefixIndex = newFileName.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO)
				+ EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO.length();
		String fileNameData = newFileName.substring(videoPrefixIndex, videoPrefixIndex + 14);
		Date fileDateTime = DateUtil.convertDate(fileNameData, DateUtil.PURE_DATETIME_PATTERN);
		String newFileNameData = DateUtil.formatDate(fileDateTime, "MM月dd日 HH:mm");
		String fileDateTimeStr = DateUtil.formatDate(fileDateTime);

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

@@ -60,7 +60,7 @@ public class UploadFileServiceImpl implements UploadFileService {
	@Override
	public String getFileUrl(String minioFileName) throws Exception {
		if (StringUtils.isEmpty(minioFileName)) {
		if (StringUtils.isEmpty(minioFileName) || "null".equals(minioFileName)) {
			log.debug("获取文件的url为空");
			return "";
		}
@@ -180,26 +180,23 @@ public class UploadFileServiceImpl implements UploadFileService {
		resultMap.put("fileType", fileType);
		if (newFileName.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO) > 0) {
			int videoPrefixIndex = newFileName.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO);
			int videoPrefixIndex = newFileName.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO)
					+ EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO.length();
			String fileNameData = newFileName.substring(
					videoPrefixIndex + EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO.length(),
					videoPrefixIndex + EbcConstant.AI_MONITOR_FILE_PREFIX_VIDEO.length() + 14);
			String fileNameData = newFileName.substring(videoPrefixIndex, videoPrefixIndex + 14);
			Date fileDataTime = DateUtil.convertDate(fileNameData, DateUtil.PURE_DATETIME_PATTERN);
			String newFileNameData = DateUtil.formatDate(fileDataTime, "MM月dd日 HH:mm");
			resultMap.put("fileName", newFileNameData);
			resultMap.put("fileDateTimeStr", DateUtil.formatDate(fileDataTime));
		} else if (newFileName.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE) > 0) {
			int picturePrefixIndex = newFileName.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE);
			int picturePrefixIndex = newFileName.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE)
					+ EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE.length();
			String fileNameData = newFileName.substring(
					picturePrefixIndex + EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE.length(),
					picturePrefixIndex + EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE.length() + 14);
			String fileNameData = newFileName.substring(picturePrefixIndex, picturePrefixIndex + 14);
			Date fileDataTime = DateUtil.convertDate(fileNameData, DateUtil.PURE_DATETIME_PATTERN);
			String newFileNameData = DateUtil.formatDate(fileDataTime, "MM月dd日 HH:mm:ss");
			String pictureSerialNum = newFileName.substring(
					picturePrefixIndex + EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE.length() + 14, fileNameIndex);
			String pictureSerialNum = newFileName.substring(picturePrefixIndex + 14, fileNameIndex);
			resultMap.put("fileName", newFileNameData + " " + pictureSerialNum);
			resultMap.put("fileDateTimeStr", DateUtil.formatDate(fileDataTime));

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

@@ -7,17 +7,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.abc.exception.BaseException;
import com.ai.bss.components.common.util.JsonUtils;
import com.ai.bss.user.dto.UserDto;
import com.ai.bss.work.attendance.dto.LeaveApprovalDto;
import com.ai.bss.work.attendance.model.AttendanceTask;
import com.ai.bss.work.attendance.service.api.ApprovalImportCommand;
import com.alibaba.fastjson.TypeReference;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.google.common.collect.Lists;
import org.apache.logging.log4j.util.Strings;
import org.junit.Assert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -25,15 +15,20 @@ import org.springframework.web.multipart.MultipartFile;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.abc.exception.BaseException;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.components.common.util.JsonUtils;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
import com.ai.bss.security.protection.service.interfaces.WorkOrderManagementService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.security.protection.utils.ExcelException;
import com.ai.bss.security.protection.utils.ExcelUtil;
import com.ai.bss.user.dto.UserDto;
import com.ai.bss.user.service.api.UserDtoQuery;
import com.ai.bss.work.attendance.dto.LeaveApprovalDto;
import com.ai.bss.work.attendance.model.AttendanceTaskSpec;
import com.ai.bss.work.attendance.service.api.ApprovalImportCommand;
import com.ai.bss.work.attendance.service.api.ApprovalTaskQuery;
import com.ai.bss.work.service.api.EventHandleCommand;
import com.ai.bss.work.service.api.WorkOrderCommand;
@@ -42,6 +37,8 @@ import com.ai.bss.work.task.model.common.WorkOrder;
import com.ai.bss.work.task.model.common.WorkTask;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
@@ -218,7 +215,7 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
		workEvent.setCharValueSet(JSON.toJSONString(params));
		log.debug("申请工单: "+JSON.toJSONString(workEvent));
		log.debug("申请工单: " + JSON.toJSONString(workEvent));
		CommonRequest<WorkEvent> eventRequest = new CommonRequest<WorkEvent>(workEvent);
		CommonResponse response = eventHandleCommand.handleEvent(eventRequest);
@@ -245,7 +242,7 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
		workOrder.setCharValueSet(JSON.toJSONString(charValueMap));
		log.debug("审核工单: "+JSON.toJSONString(workOrder));
		log.debug("审核工单: " + JSON.toJSONString(workOrder));
		CommonRequest<WorkOrder> workOrderRequest = new CommonRequest<WorkOrder>(workOrder);
		CommonResponse<WorkTask> response = workOrderCommand.reportWorkOrderResult(workOrderRequest);
@@ -258,37 +255,46 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
	}
	@Override
	public CommonResponse normalClocking(Map<String,String> map) throws Throwable {
	public CommonResponse normalClocking(Map<String, String> map) throws Throwable {
		String clockingType = map.get("clockingType");
		String employId = map.get("employId");
		UserDto userDto = new UserDto();
		userDto.setId(employId);
		CommonRequest<UserDto> request = CommonRequest.<UserDto>builder().data(userDto).pageNumber(1).pageSize(1).build();
		CommonResponse<PageBean<UserDto>>  result = userDtoQuery.queryWorkEmployee(request);
		String employOrgId = "";
		CommonRequest<UserDto> request = CommonRequest.<UserDto>builder().data(userDto).pageNumber(1).pageSize(1)
				.build();
		CommonResponse<PageBean<Map<String, Object>>> resultResponse = userDtoQuery.queryWorkEmployee(request);
		/*String employOrgId = "";
		try {
			employOrgId = result.getData().getData().get(0).getOrgId();
			employOrgId = result.getData().getData().get(0).get("id");
		}catch (Exception e){
			log.error("员工不存在");
			new BaseException("员工不存在");
		}*/
		if (resultResponse == null || resultResponse.getData() == null
				|| CollectionUtils.isEmpty(resultResponse.getData().getData())
				|| CollectionUtils.isEmpty(resultResponse.getData().getData().get(0))
				|| resultResponse.getData().getData().get(0).get("id") == null) {
			log.error("员工不存在");
			new BaseException("员工不存在");
		}
		log.info("输出参数：{}",JSON.toJSONString(result , SerializerFeature.PrettyFormat));
		String employOrgId = String.valueOf(resultResponse.getData().getData().get(0).get("id"));
		log.info("输出参数：{}", JSON.toJSONString(resultResponse, SerializerFeature.PrettyFormat));
		String clockingTime	 = map.get("clockingTime");
		String clockingTime = map.get("clockingTime");
		WorkEvent workEvent = new WorkEvent();
		workEvent.setWorkEmployeeRoleId(employId);
		workEvent.setWorkOrgRoleId(employOrgId);
		workEvent.setEventSpecId(clockingType);
		Map<String,String> charValueSet = new HashMap<>();
		charValueSet.put("clockingTime",clockingTime);
		charValueSet.put("clockingType","NORMAL");
		charValueSet.put("clockingLongitude","121.545500");
		charValueSet.put("clockingLatitude","31.281153");
		Map<String, String> charValueSet = new HashMap<>();
		charValueSet.put("clockingTime", clockingTime);
		charValueSet.put("clockingType", "NORMAL");
		charValueSet.put("clockingLongitude", "121.545500");
		charValueSet.put("clockingLatitude", "31.281153");
		workEvent.setCharValueSet(JSONObject.toJSONString(charValueSet));
//		"clockingTime": "2020-10-15 08:00:00",
//				"clockingType": "NORMAL",
@@ -302,12 +308,9 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
//				JSON.parseObject(JSONObject.toJSONString(workEvent), new TypeReference<CommonRequest<WorkEvent>>() {
//				});
//		CommonRequest<WorkEvent> requestWorkEvent = new CommonRequest<WorkEvent>(workEvent);
		CommonRequest<WorkEvent> requestWorkEvent = CommonRequest.<WorkEvent>builder().data(workEvent).build();
		log.info("WorkEvent: \n{}", JSON.toJSONString(requestWorkEvent, true));
		CommonResponse runningResult = eventHandleCommand.handleEvent(requestWorkEvent);
		log.info("success: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
@@ -325,24 +328,24 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
		String orgCode = "0000";
		CommonRequest<String> request = CommonRequest.<String>builder().data(Strings.EMPTY).build();
		CommonResponse<Map<String,Map<String,Object>>>  userMapresult = userDtoQuery.queryUserCodeWithId(request);
		CommonResponse<Map<String, Map<String, Object>>> userMapresult = userDtoQuery.queryUserCodeWithId(request);
		log.info(JSON.toJSONString(userMapresult));
		List<LeaveApprovalDto> list = Lists.newArrayList();
		// "approvalResult": "APPROVED",
		// "approvalComment": "下次注意"
  /* "workEmployeeRoleId": "201057520856",
      "workOrgRoleId": "99",
      "charValueSet": {
        "approvalType": "ASK_LEAVE",
        "approvalSubType": "ASK_LEAVE-YEA",
        "approvalReason": "zt-test",
        "approvalEmployeeRoleId": "1113",
        "beginTime": "2020-10-12",
        "endTime": "2020-10-13",
        "duration": "2",
        "leaveType": "YEA"
        */
		/* "workEmployeeRoleId": "201057520856",
		    "workOrgRoleId": "99",
		    "charValueSet": {
		"approvalType": "ASK_LEAVE",
		"approvalSubType": "ASK_LEAVE-YEA",
		"approvalReason": "zt-test",
		"approvalEmployeeRoleId": "1113",
		"beginTime": "2020-10-12",
		"endTime": "2020-10-13",
		"duration": "2",
		"leaveType": "YEA"
		*/
		LeaveApprovalDto dto = new LeaveApprovalDto();
		dto.setApprovalComment("同意");
@@ -357,13 +360,14 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
		dto.setApprovalReason(" no reason ");
		dto.setApplyTime("2020-10-12 12:00:00");
		dto.setBeginTime("2020-10-12");
		dto.setEndTime( "2020-10-13");
		dto.setEndTime("2020-10-13");
		dto.setDuration("2");
		dto.setLeaveType("YEA");
		list.add( dto);
		CommonRequest<List<LeaveApprovalDto>> conditionMapRequest = CommonRequest.<List<LeaveApprovalDto>>builder().data(list).build();
		Object importResult =  approvalImportCommand.leaveApprovalImport(conditionMapRequest);
		log.info(JSON.toJSONString( importResult));
		list.add(dto);
		CommonRequest<List<LeaveApprovalDto>> conditionMapRequest = CommonRequest.<List<LeaveApprovalDto>>builder()
				.data(list).build();
		Object importResult = approvalImportCommand.leaveApprovalImport(conditionMapRequest);
		log.info(JSON.toJSONString(importResult));
//        saveAskLeaveOrder(listTerminal, file.getOriginalFilename());
		return CommonResponse.OK_VOID;

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

@@ -0,0 +1,71 @@
package com.ai.bss.security.protection.service.interfaces;
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.work.safety.model.AiIdenLog;
/**
 * AI执行结果
 * @author konghl@asiainfo.com
 * 2020-12-24
 */
public interface AiIdenLogManageService {
	/**
	 * 分页查询AI执行结果信息
	 * @param params
	 * @param pageNumber
	 * @param pageSize
	 * @return
	 * @throws Exception
	 */
	CommonResponse<PageBean<Map<String, Object>>> queryPageAiIdenLog(Map<String, Object> params, int pageNumber,
			int pageSize) throws Exception;
	/**
	 * 查询所有AI执行结果的图片列表
	 * @param params
	 * @param pageNumber
	 * @param pageSize
	 * @return
	 * @throws Exception
	 */
	CommonResponse<List<Map<String, Object>>> queryAllAiIdenLogPicture(Map<String, Object> params, int pageNumber,
			int pageSize) throws Exception;
	/**
	 * 查询单个AI执行结果详情
	 * @param aiIdenLogId
	 * @return
	 * @throws Exception
	 */
	CommonResponse<Map<String, Object>> queryOneAiIdenLog(Long aiIdenLogId) throws Exception;
	/**
	 * 创建AI执行结果
	 * @param aiIdenLog
	 * @return
	 * @throws Exception
	 */
	CommonResponse<AiIdenLog> createAiIdenLog(AiIdenLog aiIdenLog) throws Exception;
	/**
	 * 修改AI执行结果
	 * @param aiIdenLog
	 * @return
	 * @throws Exception
	 */
	CommonResponse<AiIdenLog> modifyAiIdenLog(AiIdenLog aiIdenLog) throws Exception;
	/**
	 * 删除AI执行结果
	 * @param aiIdenLogIdList
	 * @return
	 * @throws Exception
	 */
	CommonResponse<Void> deleteAiIdenLog(List<Long> aiIdenLogIdList) throws Exception;
}

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

@@ -16,7 +16,7 @@ public interface AttendanceCommonService {
     * @return
     * @throws Exception
     */
    CommonResponse<PageBean<UserDto>> queryWorkEmployee(Map<String, Object> params) ;
    CommonResponse<PageBean<Map<String, Object>>> queryWorkEmployee(Map<String, Object> params) ;
@@ -26,7 +26,7 @@ public interface AttendanceCommonService {
     * @return
     * @throws Exception
     */
    CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception;
    CommonResponse<PageBean<Map<String, Object>>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception;
    /**
     * 查询所有部门（课通过name过滤）

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

@@ -21,7 +21,7 @@ public interface EmployeeManagementService {
	 * @return
	 * @throws Exception
	 */
	CommonResponse<PageBean<UserDto>> queryEmployeeList(UserDto userDto, int pageNumber, int pageSize) throws Exception;
	CommonResponse<PageBean<Map<String, Object>>> queryEmployeeList(UserDto userDto, int pageNumber, int pageSize) throws Exception;
	/**
	 * 查询单个用户信息
@@ -86,4 +86,12 @@ public interface EmployeeManagementService {
	 */
	CommonResponse<List<Organization>> queryCycleChildOrg(Long orgId);
	/**
	 * 根据部门ID查询下级及下下级部门的员工列表
	 * @param orgId
	 * @param pageNumber
	 * @param pageSize
	 * @return
	 */
	List<Map<String, Object>> queryEmployeeListByOrgId(Long orgId, int pageNumber, int pageSize);
}

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

@@ -13,7 +13,7 @@ import org.springframework.util.CollectionUtils;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.abc.util.JsonUtils;
import com.ai.bss.security.protection.service.interfaces.AiAlarmManageService;
import com.ai.bss.security.protection.service.interfaces.AiIdenLogManageService;
import com.ai.bss.security.protection.service.interfaces.ResourceToolManageService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.work.safety.model.AiIdenLog;
@@ -44,7 +44,7 @@ public class AiResultRecordKafkaTask {
	private MonitorSceneQuery monitorSceneQuery;
	@Autowired
	private AiAlarmManageService aiAlarmManageService;
	private AiIdenLogManageService aiIdenLogManageService;
	@KafkaListener(containerFactory = "kafkaBatchListener6", topics = "${kafka.topic.aitask:topic_ai_task}", groupId = "ai_group")
	public void AiResultRecordListener(ConsumerRecord<String, String> records, Acknowledgment ack) throws Throwable {
@@ -55,42 +55,22 @@ public class AiResultRecordKafkaTask {
			log.info("已接AI任务执行结果消息，消息为：" + message);
			JSONObject messageJson = JSONObject.parseObject(message);
			String resourceToolCod = messageJson.getString("resourceToolCode");
			String aiIdenModel = messageJson.getString("aiIdenModel");
			String resourceToolId = messageJson.getString("resourceToolId");
			String idenResultType = messageJson.getString("idenResultType");
			// 查询相关数据
			Map<String, Object> resourceToolMap = resourceToolManageService.queryResourceToolByCode(resourceToolCod);
			if (resourceToolMap == null) {
				log.error("AI任务执行结果的设备CODE不存在:  resourceToolCode=" + messageJson.getString("resourceToolCode"));
				throw new NullPointerException("resourceToolCode not exist");
			}
			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)));
			if (sceneTerminalRelResponse == null || CollectionUtils.isEmpty(sceneTerminalRelResponse.getData())) {
				log.error("AI任务执行结果的关联场景不存在:  resourceToolId=" + resourceToolId);
				throw new NullPointerException("sceneTerminalRel not exist");
			}
			Map<String, Object> sceneTerminalRelMap = sceneTerminalRelResponse.getData().get(0);
			CommonResponse<List<Map<String, Object>>> aiTaskResponse = aiAlarmManageService
					.queryAiTaskByDevice(resourceToolId, aiIdenModel);
			if (aiTaskResponse == null || CollectionUtils.isEmpty(aiTaskResponse.getData())) {
				log.error("AI任务执行结果的任务不存在:  resourceToolId=" + resourceToolId + ", aiIdenModel=" + aiIdenModel);
				throw new NullPointerException("aiTask not exist");
			}
			Map<String, Object> aiTaskMap = aiTaskResponse.getData().get(0);
			Map<String, Object> sceneTerminalRelMap = sceneTerminalRelResponse.getData().get(0);
			// 封装数据
			AiIdenLog aiIdenLog = JSON.parseObject(message, new TypeReference<AiIdenLog>() {
			});
			aiIdenLog.setResourceToolId(resourceToolId);
			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 ? ""
@@ -101,30 +81,27 @@ public class AiResultRecordKafkaTask {
					sceneTerminalRelMap.get("place") == null ? "" : String.valueOf(sceneTerminalRelMap.get("place")));
			aiIdenLog.setOrganizationId(
					sceneTerminalRelMap.get("orgId") == null ? "" : String.valueOf(sceneTerminalRelMap.get("orgId")));
			aiIdenLog.setAiTaskId(
					aiTaskMap.get("aiTaskId") == null ? 0L : Long.valueOf(String.valueOf(aiTaskMap.get("aiTaskId"))));
			// TODO 人员信息暂时默认
			aiIdenLog.setRelateEmployeeRoleId("201613310867");
			aiIdenLog.setRelateEmployeeRoleName("王浩");
			// 执行操作
			CommonRequest<AiIdenLog> aiIdenLogRequest = new CommonRequest<AiIdenLog>(aiIdenLog);
			CommonResponse<AiIdenLog> runningResult = aiTaskCommand.createAiIdenLog(aiIdenLogRequest);
			log.debug("AI任务执行结果: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
			CommonResponse<AiIdenLog> aiIdenLogRunningResult = aiIdenLogManageService.createAiIdenLog(aiIdenLog);
			log.debug("AI任务执行结果: \n{}", JsonUtils.toJSONStringByDateFormat(aiIdenLogRunningResult, true));
			if (!runningResult.isSuccess()) {
				log.error("AI任务执行结果异常: " + runningResult.getFail().getMessage());
			if (!aiIdenLogRunningResult.isSuccess()) {
				log.error("AI任务执行结果异常: " + aiIdenLogRunningResult.getFail().getMessage());
				return;
			}
			if (!EbcConstant.AI_IDENTIFY_RESULT_NORMAL.equals(idenResultType)) {
				CommonResponse runningResult1 = aiTaskCommand.aiIdenLogTriggerEvent(aiIdenLogRequest);
				CommonRequest<AiIdenLog> aiIdenLogRequest = new CommonRequest<AiIdenLog>(aiIdenLog);
				CommonResponse triggerEventRunningResult = aiTaskCommand.aiIdenLogTriggerEvent(aiIdenLogRequest);
				log.debug("AI任务非正常情况的执行结果: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult1, true));
				if (!runningResult.isSuccess()) {
					log.error("AI任务非正常情况的执行结果异常: " + runningResult.getFail().getMessage());
				log.debug("AI任务触发事件的执行结果: \n{}", JsonUtils.toJSONStringByDateFormat(triggerEventRunningResult, true));
				if (!triggerEventRunningResult.isSuccess()) {
					log.error("AI任务触发事件的执行结果异常: " + triggerEventRunningResult.getFail().getMessage());
					return;
				}
			}

security-protection-service/src/main/java/com/ai/bss/security/protection/utils/EbcConstant.java

@@ -57,6 +57,9 @@ public class EbcConstant {
	// 静态常量: AI任务状态
	public static final String BUSINESS_SPEC_AI_TASK_STATUS = "AI_TASK_STATUS";
	
	//静态常量: 职务类型
	public static final String BUSINESS_SPEC_EMPLOYEE_POSITION="mainJobPosition";
	
	// 视频监控保存视频文件固定前缀
	public static final String AI_MONITOR_FILE_PREFIX_VIDEO= "-video";
		
@@ -81,6 +84,23 @@ public class EbcConstant {
	//场景关联设备的作用类别：其他
	public static final String TERMINAL_EFFECT_TYPE_OTH="OTH";
	
	//审核状态：待审核
	public static final String AUDIT_STATUS_INI="INI";
	
	//审核状态：已生效(审核通过)
	public static final String AUDIT_STATUS_ACC="ACC";
	
	//审核状态：未生效(未审核通过)
	public static final String AUDIT_STATUS_DIS="DIS";
	
	//AI匹配模型：着装违规识别
	public static final String AI_MODEL_CLOTHING_CODE="CLOTHING_CODE";
	
	//AI匹配模型：人脸识别
	public static final String AI_MODEL_FACE="FACE";
	
	//AI匹配模型：陌生人识别
	public static final String AI_MODEL_STRANGER="STRANGER";
	
	
	// 当前登录者的STAFF_ID