From b92ca63c89b74404c3684f18c734d83531a9dd3f Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期四, 06 三月 2025 16:01:45 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 46 insertions(+), 2 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java index 44d9f8c..d4504ec 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java @@ -7,6 +7,11 @@ import com.doumee.core.annotation.trace.Trace; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; +import com.doumee.core.haikang.model.HKConstants; +import com.doumee.core.haikang.model.param.BaseResponse; +import com.doumee.core.haikang.model.param.request.FacePictureCheckRequest; +import com.doumee.core.haikang.model.param.respose.FacePictureCheckResponse; +import com.doumee.core.haikang.service.HKService; import com.doumee.core.utils.Constants; import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.FtpUtil; @@ -149,8 +154,10 @@ @ApiOperation(value = "涓婁紶鏂囦欢鍒癋TP") @RequestMapping(method= RequestMethod.POST,value="/upload") @ResponseBody - public void upload(HttpServletRequest request, HttpServletResponse response, String folder) throws Exception { + public void upload(HttpServletRequest request, HttpServletResponse response, String folder,Integer isFace) throws Exception { // folder = systemDictDataBiz.queryByCode(Constants.FTP,folder).getCode(); + Date d1 = new Date(); + log.error("鎬诲緱涓婁紶鏂囦欢鎴愬姛=============寮�濮�========="+DateUtil.getPlusTime2(d1)); folder =StringUtils.defaultString(folder).replace("/", ""); String prefixPath = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode(); InputStream is = null; @@ -175,12 +182,47 @@ MultipartFile file = multipartRequest.getFile(it.next()); String originname = file.getOriginalFilename(); is = file.getInputStream(); - String endType = originname.substring(originname.lastIndexOf("."),originname.length()); + String endType = ".jpg"; + if(originname.indexOf(".")>0){ + endType=originname.substring(originname.lastIndexOf("."),originname.length()); + } String date = DateUtil.getNowShortDate(); String fName = date+"/"+ UUID.randomUUID()+endType; String fileName = folder+"/"+fName; boolean r = ftp.uploadInputstream(is,fileName); if(r){ + 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(); + param.setFacePicUrl(prefixUrl + fileName); + BaseResponse<FacePictureCheckResponse> responseBaseResponse = HKService.facePictureCheck(param); + if(responseBaseResponse == null || !StringUtils.equals(responseBaseResponse.getCode(), HKConstants.RESPONSE_SUCCEE)){ + 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())){ + context.put("code", 0); + context.put("message", "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~"); + context.put("errno",0); + writerJson(response, context); + return; + } + if(!facePictureCheckResponse.getCheckResult()){ + 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); context.put("errno",0); @@ -194,6 +236,8 @@ context.put("data",fileJSON); context.put("message","璇锋眰鎴愬姛"); writerJson(response, context); + Date d2= new Date(); + log.error("鎬荤殑涓婁紶鏂囦欢鎴愬姛=============缁撴潫========="+DateUtil.getPlusTime2(d2) +"鑰楁椂绉掞細"+( (d2.getTime()-d1.getTime()) /1000)); return; } } -- Gitblit v1.9.3