diff --git a/src/main/java/com/ycwl/basic/model/task/resp/SearchFaceRespVo.java b/src/main/java/com/ycwl/basic/model/task/resp/SearchFaceRespVo.java index 89b4876..2c98e6a 100644 --- a/src/main/java/com/ycwl/basic/model/task/resp/SearchFaceRespVo.java +++ b/src/main/java/com/ycwl/basic/model/task/resp/SearchFaceRespVo.java @@ -6,7 +6,7 @@ import java.util.List; @Data public class SearchFaceRespVo { - private Float score; + private float score; private List sampleListIds; private String searchResultJson; private Float firstMatchRate; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java index b3bf552..01653a7 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java @@ -19,6 +19,7 @@ import com.ycwl.basic.service.task.TaskService; import com.ycwl.basic.task.FaceCleaner; import com.ycwl.basic.utils.*; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -121,6 +122,10 @@ public class FaceServiceImpl implements FaceService { //1、上传人脸照片 String faceUrl = uploadFileALiOss(file, userId); SearchFaceRespVo searchFaceRespVo = faceService.searchFace(scenicId, faceUrl); + if (searchFaceRespVo == null) { + ossUtil.deleteFileByUrl(faceUrl); + throw new BaseException("人脸照片校验失败,请重新上传"); + } float score = searchFaceRespVo.getScore(); if (score faceItems = matchList.get(0).getFaceItems().stream() .filter(faceItemsItem -> faceItemsItem.getConfidence() > 50).collect(Collectors.toList()); List faceSampleIds = faceItems.stream() .map(SearchFaceResponse.Data.MatchListItem.FaceItemsItem::getExtraData) .map(Long::parseLong) .collect(Collectors.toList()); - respVo.setSearchResultJson(JSON.toJSONString(matchList.get(0))); respVo.setFirstMatchRate(matchList.get(0).getFaceItems().get(0).getConfidence()); respVo.setSampleListIds(faceSampleIds); - respVo.setScore(matchList.get(0).getQualitieScore()); return respVo; } catch (Exception e) { log.error("人脸搜索失败:{}", e.getMessage()); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b47c98d..03c9181 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -14,9 +14,9 @@ spring: datasource: # 数据源的相关配置 type: com.zaxxer.hikari.HikariDataSource # 数据源类型:HikariCP driver-class-name: com.mysql.cj.jdbc.Driver # mysql驱动 - url: jdbc:mysql://8.134.112.96:3306/liuying_mgmt_re?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true - username: root - password: yckj2017 + url: jdbc:mysql://106.14.162.214:3306/zt?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + username: zt + password: ZhEnTuAi2024zHeNtUaI hikari: connection-timeout: 30000 # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没可用的连接则发生SQLException, 默认:30秒 minimum-idle: 5 # 最小连接数