diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/BraceletServiceImpl.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/BraceletServiceImpl.java index 1692d78..548093f 100644 --- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/BraceletServiceImpl.java +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/BraceletServiceImpl.java @@ -299,6 +299,9 @@ public class BraceletServiceImpl implements BraceletService{ R r= sourceService.addFileSource(fileVo, SecurityConstants.INNER); if(r.getData()){ AjaxResult ajaxResult = addFaceToLibrary(BytesToMultipartFileUtil.multipartFileToBase64(file), FaceCodeUtil.ADD, "ls-" + user.getId()); + if(ajaxResult.get("data") == null){ + throw new ServiceException("人脸照片未检测到人脸"); + } JSONObject data = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult.get("data"))); Integer code = data.getInteger("code"); String msg = data.getString("msg"); diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java index ce19d73..e15c7b7 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java @@ -14,6 +14,7 @@ import com.bonus.common.core.constant.BusinessConstants; import com.bonus.common.core.constant.HttpStatus; import com.bonus.common.core.constant.SecurityConstants; import com.bonus.common.core.domain.R; +import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.*; import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.utils.global.SystemGlobal; @@ -184,6 +185,9 @@ public class PersonMgeServiceImpl implements IPersonMgeService { delFileId = uploadFile(file, vo); // 添加人脸照片至人脸库 AjaxResult ajaxResult = addFaceToLibrary(BytesToMultipartFileUtil.multipartFileToBase64(file), FaceCodeUtil.ADD, "bz-" + vo.getId()); + if(ajaxResult.get("data") == null){ + throw new ServiceException("人脸照片未检测到人脸"); + } JSONObject data = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult.get("data"))); Integer code = data.getInteger("code"); String msg = data.getString("msg"); @@ -199,6 +203,9 @@ public class PersonMgeServiceImpl implements IPersonMgeService { if (delFileId != null) { remoteFileService.delFile(delFileId, SecurityConstants.INNER); } + if(Objects.equals(e.getMessage(),"人脸照片未检测到人脸")){ + return AjaxResult.error("人脸照片未检测到人脸"); + } TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error(); } @@ -266,6 +273,9 @@ public class PersonMgeServiceImpl implements IPersonMgeService { } } AjaxResult ajaxResult = addFaceToLibrary(BytesToMultipartFileUtil.multipartFileToBase64(file), FaceCodeUtil.ADD, "bz-" + vo.getId()); + if(ajaxResult.get("data") == null){ + throw new ServiceException("人脸照片未检测到人脸"); + } JSONObject data = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult.get("data"))); Integer code = data.getInteger("code"); String msg = data.getString("msg"); @@ -282,6 +292,9 @@ public class PersonMgeServiceImpl implements IPersonMgeService { if (StringUtils.isNotEmpty(delFileId)) { remoteFileService.delFile(delFileId, SecurityConstants.INNER); } + if(Objects.equals(e.getMessage(),"人脸照片未检测到人脸")){ + return AjaxResult.error("人脸照片未检测到人脸"); + } TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error(); } @@ -500,6 +513,9 @@ public class PersonMgeServiceImpl implements IPersonMgeService { mapper.addPerson(vo); // 推送人脸照片到人脸库,并更新推送状态 AjaxResult ajaxResult = addFaceToLibrary(BytesToMultipartFileUtil.multipartFileToBase64(vo.getFile()), FaceCodeUtil.ADD, "bz-" + vo.getId()); + if(ajaxResult.get("data") == null){ + throw new ServiceException("第" + vo.getSerialNumber() +"人脸照片未检测到人脸"); + } JSONObject data = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult.get("data"))); Integer code = data.getInteger("code"); String msg = data.getString("msg"); @@ -527,6 +543,9 @@ public class PersonMgeServiceImpl implements IPersonMgeService { delFaceToLibrary(null, FaceCodeUtil.DEL, errorIdLists.get(i)); } } + if(e.getMessage().contains("人脸照片未检测到人脸")){ + return AjaxResult.error(e.getMessage()); + } TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error(); }