Merge remote-tracking branch 'origin/master'

jiangping

2025-06-30 ccbcb9487250f063dc7c4e72cfa18228dca8dac8

 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;
@@ -43,8 +48,6 @@
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/public")
@Slf4j
public class PublicCloudController extends BaseController {


    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

@@ -100,7 +103,7 @@
                        String endType = originname.substring(originname.lastIndexOf("."), originname.length());
                        String date = DateUtil.getNowShortDate();
                        String fName = date + "/" + UUID.randomUUID() + endType;
                        String fileName = folder + "/" + fName;
                        String fileName = folder + fName;
                        boolean r = ftp.uploadInputstreamBatch(is, fileName, Constants.equalsInteger(index ,fileList.size()),index);
                        if (r) {
                            JSONObject fileJSON = new JSONObject();
@@ -151,8 +154,10 @@
    @ApiOperation(value = "上传文件到FTP")
    @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;
@@ -177,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);
@@ -191,11 +231,14 @@
//                        fileJSON.put("folder", folder);
                        fileJSON.put("url", prefixPath+fileName);
                        fileJSON.put("imgaddr", fName);
                        fileJSON.put("fileSize", file.getSize());
                        fileJSON.put("imgname", fileName);
                        fileJSON.put("originname", originname);
                        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;
                    }
                }
@@ -303,9 +346,6 @@
            e.printStackTrace();
        }
    }




    public void uploadFileLocal(HttpServletRequest request, String folder, HttpServletResponse response, String rootPath,String dir) throws Exception {
        response.setCharacterEncoding("UTF-8");