diff --git a/src/main/java/com/ycwl/basic/service/impl/task/TaskFaceServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/task/TaskFaceServiceImpl.java index d665c4a..bc79db3 100644 --- a/src/main/java/com/ycwl/basic/service/impl/task/TaskFaceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/task/TaskFaceServiceImpl.java @@ -9,6 +9,7 @@ import com.aliyuncs.facebody.model.v20191230.AddFaceResponse; import com.aliyuncs.facebody.model.v20191230.DeleteFaceEntityRequest; import com.aliyuncs.facebody.model.v20191230.SearchFaceRequest; import com.aliyuncs.facebody.model.v20191230.SearchFaceResponse; +import com.ycwl.basic.config.FaceDetectConfig; import com.ycwl.basic.mapper.pc.DeviceMapper; import com.ycwl.basic.mapper.pc.FaceMapper; import com.ycwl.basic.mapper.pc.FaceSampleMapper; @@ -21,6 +22,7 @@ import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO; import com.ycwl.basic.model.task.resp.AddFaceRespVo; import com.ycwl.basic.model.task.resp.SearchFaceRespVo; import com.ycwl.basic.service.task.TaskFaceService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.aliyuncs.DefaultAcsClient; @@ -43,9 +45,12 @@ public class TaskFaceServiceImpl implements TaskFaceService { private static final String DATE_FORMAT="yyyyMMddHHmmssSSS"; @Autowired private DeviceMapper deviceMapper; + @Autowired + private FaceDetectConfig faceDetectConfig; private IAcsClient getClient() { - DefaultProfile profile = DefaultProfile.getProfile("cn-shanghai","LTAIDySvOV8yC7VZ","RgO5bwRnHrsyDak0IaLEF6iTRo7469"); + DefaultProfile profile = DefaultProfile.getProfile( + faceDetectConfig.getRegion(),faceDetectConfig.getAccessKeyId(), faceDetectConfig.getAccessKeySecret()); IAcsClient client = new DefaultAcsClient(profile); return client; } @@ -71,12 +76,13 @@ public class TaskFaceServiceImpl implements TaskFaceService { faceEntity.setScore(matchList.get(0).getQualitieScore()); List faceItems = matchList.get(0).getFaceItems().stream() .filter(faceItemsItem -> faceItemsItem.getConfidence() > 50).collect(Collectors.toList()); - faceEntity.setMatchSampleIds( - faceItems.stream() - .map(SearchFaceResponse.Data.MatchListItem.FaceItemsItem::getExtraData) - .collect(Collectors.joining(",")) - ); + List faceSampleIds = faceItems.stream() + .map(SearchFaceResponse.Data.MatchListItem.FaceItemsItem::getExtraData) + .map(Long::parseLong) + .collect(Collectors.toList()); + faceEntity.setMatchSampleIds(StringUtils.joinWith(",", faceSampleIds)); faceMapper.update(faceEntity); + respVo.setSampleListIds(faceSampleIds); respVo.setScore(matchList.get(0).getQualitieScore()); return respVo; } catch (Exception e) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 86673b0..f1c98eb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -94,4 +94,9 @@ aliYunOss: bucketName: "frametour-assets" objectName: "user-faces/" url: "https://frametour-assets.oss-cn-shanghai.aliyuncs.com/" + region: "cn-shanghai" +#阿里云人脸检测 +aliYunFace: + accessKeyId: "LTAI5tMwrmxVcUEKoH5QzLHx" + accessKeySecret: "ZCIP8aKx1jwX1wkeYIPQEDZ8fPtN1c" region: "cn-shanghai" \ No newline at end of file