From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java
index 438cdd3..07a3be3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java
@@ -131,24 +131,36 @@
String fileName = folder+fName;
boolean r = ftp.uploadInputstream(is,fileName);
if(r){
- if(Constants.equalsInteger(isFace,Constants.ZERO)){
+ if(Objects.nonNull(isFace) && Constants.equalsInteger(isFace,Constants.ZERO)){
//楠岃瘉浜鸿劯璇勫垎
//浜鸿劯璇勫垎
FacePictureCheckRequest param = new FacePictureCheckRequest();
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode() +
- systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode();
param.setFacePicUrl(prefixUrl + fileName);
BaseResponse<FacePictureCheckResponse> responseBaseResponse = HKService.facePictureCheck(param);
if(responseBaseResponse == null || !StringUtils.equals(responseBaseResponse.getCode(), HKConstants.RESPONSE_SUCCEE)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
+ context.put("code", 0);
+ context.put("message", "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
+ context.put("errno",0);
+ writerJson(response, context);
+ return;
}
FacePictureCheckResponse facePictureCheckResponse = responseBaseResponse.getData();
if(Objects.isNull(facePictureCheckResponse) || Objects.isNull(facePictureCheckResponse.getCheckResult())){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
+ context.put("code", 0);
+ context.put("message", "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
+ context.put("errno",0);
+ writerJson(response, context);
+ return;
}
if(!facePictureCheckResponse.getCheckResult()){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), facePictureCheckResponse.getStatusMessage());
+ context.put("code", 0);
+ context.put("message", facePictureCheckResponse.getStatusMessage());
+ context.put("errno",0);
+ writerJson(response, context);
+ return;
}
+
}
context.put("success", true);
context.put("code", 200);
--
Gitblit v1.9.3