diff --git a/suimangCApi/src/main/java/com/iformall/controller/PersonPhotoController.java b/suimangCApi/src/main/java/com/iformall/controller/PersonPhotoController.java index c652f92..6526fc5 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/PersonPhotoController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/PersonPhotoController.java @@ -10,6 +10,7 @@ import com.iformall.enums.EnumMouldSendType; import com.iformall.enums.EnumaMouldPatchStatus; import com.iformall.service.sm.MouldPatchSignService; import com.iformall.service.sm.PersonPhotoService; +import com.iformall.sm.AiBaiduCheckResult; import com.iformall.utils.BaiduImageCheckUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -108,8 +109,8 @@ public class PersonPhotoController extends BaseController { if (size > length) { return new ResultData(ErrorCode.PICTURE_FOUR_SIZE_EXCEED); } - String result = BaiduImageCheckUtil.photoCheck(file); - return new ResultData(result); + AiBaiduCheckResult checkResult = BaiduImageCheckUtil.photoCheck(file); + return new ResultData(checkResult); } diff --git a/suimangCApi/src/main/java/com/iformall/utils/BaiduImageCheckUtil.java b/suimangCApi/src/main/java/com/iformall/utils/BaiduImageCheckUtil.java index 60e3116..efe41d9 100644 --- a/suimangCApi/src/main/java/com/iformall/utils/BaiduImageCheckUtil.java +++ b/suimangCApi/src/main/java/com/iformall/utils/BaiduImageCheckUtil.java @@ -2,6 +2,8 @@ package com.iformall.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.iformall.common.ErrorCode; +import com.iformall.sm.AiBaiduCheckResult; import okhttp3.*; import org.springframework.web.multipart.MultipartFile; @@ -29,7 +31,7 @@ public class BaiduImageCheckUtil { public static final OkHttpClient HTTP_CLIENT = new OkHttpClient().newBuilder().build(); - public static String photoCheck(MultipartFile file) { + public static AiBaiduCheckResult photoCheck(MultipartFile file) { try { byte[] fileBytes = file.getBytes(); String imgStr = Base64Util.encode(fileBytes); @@ -44,21 +46,28 @@ public class BaiduImageCheckUtil { JSONObject jsonObject = JSON.parseObject(result); //1:合规,2:不合规,3:疑似,4:审核失败 Integer type = jsonObject.getInteger("conclusionType"); - String msg; + AiBaiduCheckResult checkResult = new AiBaiduCheckResult(); if (type == 1) { - msg = "图片合规"; + checkResult.setMsg("图片合规"); + checkResult.setCode(200); } else if (type == 2 || type == 3) { - msg = "图片不合规"; + checkResult.setMsg("图片不合规"); + checkResult.setCode(ErrorCode.SYS_SERVER_ERROR.getCode()); } else if (type == 4) { - msg = "图片审核失败"; + checkResult.setMsg("图片审核失败"); + checkResult.setCode(ErrorCode.SYS_SERVER_ERROR.getCode()); } else { - msg = "图片审核失败"; + checkResult.setMsg("图片审核失败"); + checkResult.setCode(ErrorCode.SYS_SERVER_ERROR.getCode()); } - return msg; + return checkResult; } catch (Exception e) { e.printStackTrace(); + AiBaiduCheckResult checkResult = new AiBaiduCheckResult(); + checkResult.setMsg("图片审核失败"); + checkResult.setCode(ErrorCode.SYS_SERVER_ERROR.getCode()); + return checkResult; } - return "图片审核接口请求失败"; } /** diff --git a/suimangService/src/main/java/com/iformall/sm/AiBaiduCheckResult.java b/suimangService/src/main/java/com/iformall/sm/AiBaiduCheckResult.java new file mode 100644 index 0000000..a742080 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/sm/AiBaiduCheckResult.java @@ -0,0 +1,11 @@ +package com.iformall.sm; + +import lombok.Data; + +@Data +public class AiBaiduCheckResult { + + private boolean success; + private String msg; + private Integer code; +}