|
|
@@ -71,12 +71,12 @@ public class UserFaceServiceImpl implements UserFaceService {
|
|
|
return ResultContent.build(ResultState.Fail);
|
|
|
}
|
|
|
|
|
|
- User user = userDao.findTop1ById(userFaceUploadModel.getUserId());
|
|
|
- if (user == null) {
|
|
|
- return ResultContent.build(ResultState.UserNotExists);
|
|
|
- }
|
|
|
+// User user = userDao.findTop1ById(userFaceUploadModel.getUserId());
|
|
|
+// if (user == null) {
|
|
|
+// return ResultContent.build(ResultState.UserNotExists);
|
|
|
+// }
|
|
|
|
|
|
- String key = user.getId() + "_" + System.currentTimeMillis();
|
|
|
+ String key = userFaceUploadModel.getUserId() + "_" + System.currentTimeMillis();
|
|
|
UserFace userFace = new UserFace();
|
|
|
boolean isUpdate = StringUtils.isNotBlank(userFaceUploadModel.getUpdateFaceFileId());
|
|
|
if (isUpdate) {
|
|
|
@@ -95,18 +95,18 @@ public class UserFaceServiceImpl implements UserFaceService {
|
|
|
//上传人脸库,获取向量
|
|
|
String fileBase64 = userFaceUploadModel.getFile();
|
|
|
byte[] decode = Base64.getDecoder().decode(fileBase64);
|
|
|
-// @Cleanup InputStream inputStream = new ByteArrayInputStream(decode);
|
|
|
+ @Cleanup InputStream inputStream = new ByteArrayInputStream(decode);
|
|
|
|
|
|
- HttpResponse<String> response = faceHelper.uploadFs(new ByteArrayInputStream(decode), key);
|
|
|
+ HttpResponse<String> response = faceHelper.uploadFs(inputStream, key);
|
|
|
if (response.statusCode() != 200) {
|
|
|
return ResultContent.build(ResultState.Fail, "人脸特征提取失败");
|
|
|
}
|
|
|
|
|
|
//图片入库
|
|
|
- String fileId = gridFsTemplate.store(new ByteArrayInputStream(decode), UUID.randomUUID().toString(), Map.of("userId", userFaceUploadModel.getUserId())).toHexString();
|
|
|
+ String fileId = gridFsTemplate.store(inputStream, UUID.randomUUID().toString(), Map.of("userId", userFaceUploadModel.getUserId())).toHexString();
|
|
|
|
|
|
//向量入库
|
|
|
- userFace.setUserId(user.getId());
|
|
|
+ userFace.setUserId(userFaceUploadModel.getUserId());
|
|
|
userFace.setFaceFSId(fileId);
|
|
|
userFace.setFaceDataKey(key);
|
|
|
userFaceDao.save(userFace);
|
|
|
@@ -123,10 +123,10 @@ public class UserFaceServiceImpl implements UserFaceService {
|
|
|
*/
|
|
|
@Transactional
|
|
|
public ResultContent delete(@NotNull String userId, @NotNull String faceFileId) {
|
|
|
- User user = userDao.findTop1ById(userId);
|
|
|
- if (user == null) {
|
|
|
- return ResultContent.build(ResultState.UserNotExists);
|
|
|
- }
|
|
|
+// User user = userDao.findTop1ById(userId);
|
|
|
+// if (user == null) {
|
|
|
+// return ResultContent.build(ResultState.UserNotExists);
|
|
|
+// }
|
|
|
|
|
|
UserFace userFace = userFaceDao.findTopByUserIdAndFaceFSId(userId, faceFileId);
|
|
|
if (userFace == null) {
|