diff --git a/web-client/src/main/java/com/zcloud/edu/config/FileUrlConfig.java b/web-client/src/main/java/com/zcloud/edu/config/FileUrlConfig.java index 52596db..8631ba3 100644 --- a/web-client/src/main/java/com/zcloud/edu/config/FileUrlConfig.java +++ b/web-client/src/main/java/com/zcloud/edu/config/FileUrlConfig.java @@ -15,6 +15,6 @@ public class FileUrlConfig { prefixUrl = prefixUrlProperties; } public String getPrefixUrl() { - return prefixUrl; + return "http://192.168.192.201:8991/file/uploadFiles2/"; } } diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/study/StudentSignE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/study/StudentSignE.java index 07044ae..3c90e9c 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/study/StudentSignE.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/model/study/StudentSignE.java @@ -4,12 +4,15 @@ import com.alibaba.cola.exception.BizException; import com.jjb.saas.framework.domain.model.BaseE; import com.zcloud.gbscommon.utils.Base64Util; import com.zcloud.gbscommon.utils.FaceUtil; +import com.zcloud.gbscommon.utils.HttpRequestUtil; import com.zcloud.gbscommon.utils.Tools; import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.Map; /** * web-domain @@ -65,20 +68,35 @@ public class StudentSignE extends BaseE { private Long updateId; public void compareFace(String templateFaceUrl, String faceUrl, String prefixUrl) throws Exception { - System.out.println("第7步-----------------------------"+ System.currentTimeMillis()); + try { + System.out.println("第7步-----------------------------" + prefixUrl + templateFaceUrl); String templateFace = Base64Util.urlToBase64(prefixUrl + templateFaceUrl); - System.out.println("第8步-----------------------------"+ System.currentTimeMillis()); + System.out.println("第8步-----------------------------" + System.currentTimeMillis()); + Map map = new HashMap(); + map.put("pic1", templateFace); + map.put("pic2", faceUrl); + + System.out.println("第2229步-----------------------------" + System.currentTimeMillis()); + String compareResult = HttpRequestUtil.doPost("http://192.168.151.32:8893/face/compareFace", map.toString()); + System.out.println(compareResult + "--------------8888888888888888888888888888888888888888888"); String confidence = FaceUtil.compareFace(templateFace, faceUrl); System.out.println("第9步-----------------------------"+ System.currentTimeMillis()); - if (Double.valueOf(confidence) < 75) { +// if (Double.valueOf(compareResult) < 75) { +// throw new BizException("人脸不匹配"); +// } + + this.setStudentSignId(Tools.get32UUID()); + } catch (Exception e){ + e.printStackTrace(); throw new BizException("人脸不匹配"); } - this.setStudentSignId(Tools.get32UUID()); + } public void init(String studentId, String classId, long corpinfoId){ this.setStudentId(studentId); this.setClassId(classId); this.setCorpinfoId(corpinfoId); + this.setStudentSignId(Tools.get32UUID()); } } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/gatewayimpl/study/StudentSignGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/edu/gatewayimpl/study/StudentSignGatewayImpl.java index aa1ea34..8e1d3ce 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/gatewayimpl/study/StudentSignGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/gatewayimpl/study/StudentSignGatewayImpl.java @@ -1,10 +1,12 @@ package com.zcloud.edu.gatewayimpl.study; +import com.alibaba.cloud.commons.lang.StringUtils; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.zcloud.edu.domain.gateway.study.StudentSignGateway; import com.zcloud.edu.domain.model.study.StudentSignE; import com.zcloud.edu.persistence.dataobject.study.StudentSignDO; import com.zcloud.edu.persistence.repository.study.StudentSignRepository; +import com.zcloud.gbscommon.utils.Tools; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -24,6 +26,9 @@ public class StudentSignGatewayImpl implements StudentSignGateway { @Override public Boolean add(StudentSignE studentSignE) { + if(StringUtils.isEmpty(studentSignE.getStudentSignId())){ + studentSignE.setStudentSignId(Tools.get32UUID()); + } StudentSignDO d = new StudentSignDO(); BeanUtils.copyProperties(studentSignE, d); studentSignRepository.save(d);