server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -1231,20 +1231,20 @@ return null; } /** *增量车辆查询（分页） *人脸评分 * @return */ public static BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> facePictureCheck(TimeRangeListRequest param){ log.info("【海康增量人员查询】================开始===="+JSONObject.toJSONString(param)); public static BaseResponse<FacePictureCheckResponse> facePictureCheck(FacePictureCheckRequest param){ log.info("【人脸评分】================开始===="+JSONObject.toJSONString(param)); try { String res = HKTools.facePictureCheck(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> >(){}; BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType()); logResult(result,"海康增量人员查询"); new TypeReference<BaseResponse<FacePictureCheckResponse>>(){}; BaseResponse<FacePictureCheckResponse> result = JSONObject.parseObject(res, typeReference.getType()); logResult(result,"人脸评分"); return result; }catch (Exception e){ log.error("【海康增量人员查询】================失败====：\n"+ e.getMessage()); log.error("【人脸评分】================失败====：\n"+ e.getMessage()); } return null; } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java
@@ -110,9 +110,16 @@ ); if(Objects.isNull(wmsJobContractVO.getLockStatus())&& com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(wmsJobContractVO.getPlatformWmsDetailList())){ if(Constants.equalsInteger(platformWmsJob.getType(),Constants.ONE)){ if(Objects.isNull(wmsJobContractVO.getPlatformWmsDetailList().get(Constants.ZERO).getLockStatus())){ wmsJobContractVO.setLockStatus(Constants.ZERO ); }else{ wmsJobContractVO.setLockStatus( wmsJobContractVO.getPlatformWmsDetailList().get(Constants.ZERO).getLockStatus() ); } } wmsJobContractVO.setStatus( wmsJobContractVO.getPlatformWmsDetailList().get(Constants.ZERO).getStatus() ); server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -12,9 +12,13 @@ import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse; import com.doumee.core.exception.BusinessException; import com.doumee.core.haikang.model.HKConstants; import com.doumee.core.haikang.model.param.BaseListPageResponse; import com.doumee.core.haikang.model.param.BaseResponse; import com.doumee.core.haikang.model.param.request.FacePictureCheckRequest; import com.doumee.core.haikang.model.param.request.VisitAppointmentOutRequest; import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest; import com.doumee.core.haikang.model.param.respose.AscDeviceStatusInfoResponse; import com.doumee.core.haikang.model.param.respose.FacePictureCheckResponse; import com.doumee.core.haikang.model.param.respose.VisitAppointmentResponse; import com.doumee.core.haikang.service.HKService; import com.doumee.core.model.LoginUserInfo; @@ -64,6 +68,9 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.*; import java.util.stream.Collectors; @@ -232,6 +239,31 @@ visits.setVisitType(Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MDJ_VISIT_REQUIRED).getCode())); //初始化访客信息 initVisitInfo(visits,date); //人脸评分 FacePictureCheckRequest param = new FacePictureCheckRequest(); String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode(); param.setFacePicBinaryData(visits.getFaceImg()); try{ Path path = Paths.get(prefixUrl + visits.getFaceImg()); // Path path = Paths.get("d://b0e01861-fcef-4e22-a209-66a649f1b7ef.jpg"); byte[] imageBytes = Files.readAllBytes(path); param.setFacePicBinaryData(Base64.getEncoder().encodeToString(imageBytes)); }catch (Exception e){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"人脸信息解析失败"); } BaseResponse<FacePictureCheckResponse> response = HKService.facePictureCheck(param); if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，人脸评分获取数据失败~"); } FacePictureCheckResponse facePictureCheckResponse = response.getData(); if(!facePictureCheckResponse.getCheckResult()){ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), facePictureCheckResponse.getStatusMessage()); } visitsMapper.insert(visits); //发起ERP审批申请 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
@@ -23,8 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.*; import java.util.stream.Collectors; /** * WMS平台对接Service实现 @@ -340,6 +342,13 @@ job.setArriveDate(new Date()); job.setSingType(Constants.TWO); job.setSignDate(new Date()); List<PlatformJob> signList = platformJobMapper.selectList(new QueryWrapper<PlatformJob>().lambda().apply(" DATE(SIGN_DATE) = DATE(NOW()) and sign_date is not null ")); if(CollectionUtils.isEmpty(signList)){ job.setSignNum(Constants.ONE); } else{ int maxNumber = Collections.max(signList.stream().map(i->i.getSignNum()).collect(Collectors.toList())); job.setSignNum(maxNumber + Constants.ONE); } } } PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()
