增加考勤打卡服务

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/constant/MonitorManageConsts.java

@@ -28,25 +28,20 @@ public class MonitorManageConsts {
    //着装违规识别
    //着装违规识别(是否带头盔)
    public static String AI_MODEL_CLOTHING_CODE = "CLOTHING_CODE";
    //人脸识别
    public static String AI_MODEL_FACE = "FACE";
    //陌生人识别
    public static String AI_MODEL_STRANGER = "STRANGER";
    public static String AI_MODEL_OTHER = "OTHER";
    //AI识别结果:正常
    public static final String AI_IDENTIFY_RESULT= "NOM";
    public static final String PROCESS_FAIL_STATUS = "FAI";
    public static final String PROCESS_SUCCESS_STATUS = "SUC";
    //AI识别结果：违规
    public static final String AI_IDENTIFY_RESULT_ALARM= "ALA";
//    //AI识别结果:正常
//    public static final String AI_IDENTIFY_RESULT= "AI_IDENTIFY_RESULT";
//
//    //AI识别结果：违规
//    public static final String AI_IDENTIFY_RESULT_ALARM= "AI_IDENTIFY_RESULT_ALARM";
//
//    //AI识别结果：考勤
//    public static final String AI_IDENTIFY_RESULT_ATTENDANCE= "AI_IDENTIFY_RESULT_ATTENDANCE";
    //AI识别结果：考勤
    public static final String AI_IDENTIFY_RESULT_ATTENDANCE= "ATT";
}

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/service/impl/MonitorManageServiceImpl.java

@@ -208,7 +208,7 @@ public class MonitorManageServiceImpl implements MonitorManageService {
//										safety_hat表示安全帽；ordinart_hat表示普通帽子；chef_hat表示厨师帽；none表示未戴帽子
					if(aiClassName.equals("none")){
						aiIdenLogDto.setIdenResult("未戴帽子");
						aiIdenLogDto.setIdenResultType(MonitorManageConsts.PROCESS_SUCCESS_STATUS);
						aiIdenLogDto.setIdenResultType(MonitorManageConsts.AI_IDENTIFY_RESULT_ALARM);
						aiIdenLogDto.setAiIdenModel(MonitorManageConsts.AI_MODEL_CLOTHING_CODE);
					}else{
						if(aiClassName.equals("safety_hat")){
@@ -218,8 +218,8 @@ public class MonitorManageServiceImpl implements MonitorManageService {
						}else if(aiClassName.equals("chef_hat")){
							aiIdenLogDto.setIdenResult("厨师帽");
						}
						aiIdenLogDto.setIdenResultType(MonitorManageConsts.PROCESS_SUCCESS_STATUS);
						aiIdenLogDto.setAiIdenModel(MonitorManageConsts.AI_MODEL_OTHNG_CODER);
						aiIdenLogDto.setIdenResultType(MonitorManageConsts.AI_IDENTIFY_RESULT);
						aiIdenLogDto.setAiIdenModel(MonitorManageConsts.AI_MODEL_CLOTHING_CODNG_CODE);
					}
				}
			}

monitor-manage-service/src/main/resources/application.properties

@@ -1,6 +1,6 @@
spring.application.name=WorkTaskSpec
server.port=8018
server.port=8028
server.servlet.context-path=/sp

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

@@ -132,6 +132,23 @@ public class WorkOrderManagementController {
		return workOrderManagementService.checkWorkOrder(params);
	}
	/**
	 * 工单审核
	 *
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/normalClocking")
	public CommonResponse normalClocking(@RequestBody Map<String,String> params) throws Throwable {
//		if (params == null || StringUtils.isEmpty(params.get("orderId"))|| StringUtils.isEmpty(params.get("result"))) {
//			return CommonResponse.fail("500", "审核失败");
//		}
		return workOrderManagementService.normalClocking(params);
	}
	@RequestMapping("/importAskLeaveOrder")
	public CommonResponse importAskLeaveOrder(@RequestParam("file") MultipartFile file) {

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

@@ -7,10 +7,16 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
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;
@@ -251,6 +257,62 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
	}
	@Override
	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 = result.getData().getData().get(0).getOrgId();
		log.info("输出参数：{}",JSON.toJSONString(result , SerializerFeature.PrettyFormat));
		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");
		workEvent.setCharValueSet(JSONObject.toJSONString(charValueSet));
//		"clockingTime": "2020-10-15 08:00:00",
//				"clockingType": "NORMAL",
//				"clockingLongitude": "",
//				"clockingLatitude": ""
//		String jsonString = JsonUtils.loadStringFromResourceFile("/test/newClocking_NormalClocking.json");
//		log.info("jsonString: {}", jsonString);
//		CommonRequest<WorkEvent> requestWorkEvent =
//				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));
//		// 业务结果应该是成功
//		Assert.assertTrue(runningResult != null && (runningResult instanceof CommonResponse) && runningResult.isSuccess());
		// 打卡状态应该是正常
//		AttendanceTask attendanceTask = (AttendanceTask) runningResult.getData();
//		Assert.assertEquals("NOR", attendanceTask.getGoToWorkStatus());
		return runningResult;
	}
	@Override
	public CommonResponse importAskLeaveOrder(MultipartFile file) {
//        List<String> listTerminal = getFileData(file);

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

@@ -1,6 +1,5 @@
package com.ai.bss.security.protection.service.interfaces;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.work.safety.model.MonitorSceneTerminalRel;

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

@@ -54,6 +54,8 @@ public interface WorkOrderManagementService {
	 */
	CommonResponse<Void> checkWorkOrder(Map<String, String> params) throws Throwable;
	CommonResponse normalClocking(Map<String,String> map) throws Throwable;
	 CommonResponse importAskLeaveOrder(MultipartFile file) ;
}