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/cloud/common/PublicCloudController.java | 211 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 196 insertions(+), 15 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 b47d7a0..831575c 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
@@ -1,18 +1,34 @@
package com.doumee.cloud.common;
+import cn.hutool.core.io.IoUtil;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
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;
+import com.doumee.core.utils.HttpsUtil;
import com.doumee.core.utils.aliyun.ALiYunUtil;
+import com.doumee.dao.business.dto.DownloadFileDTO;
+import com.doumee.dao.system.model.SystemDict;
+import com.doumee.dao.system.model.SystemDictData;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.archivers.zip.Zip64Mode;
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -20,16 +36,13 @@
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.UUID;
+import java.io.*;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.util.*;
/**
* @author Eva.Caesar Liu
@@ -41,8 +54,6 @@
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/public")
@Slf4j
public class PublicCloudController extends BaseController {
-
-
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -50,11 +61,145 @@
public static FtpUtil ftp = null;
+ @ApiOperation(value = "鎵归噺涓婁紶鏂囦欢鍒癋TP")
+ @RequestMapping(method= RequestMethod.POST,value="/uploadBatch")
+ @ResponseBody
+ public void uploadBatch(HttpServletRequest request, HttpServletResponse response, String folder) throws Exception {
+ if(Objects.isNull(folder)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ SystemDictData folderData = systemDictDataBiz.queryByCode(Constants.FTP,folder);
+ if(Objects.isNull(folderData)||StringUtils.isBlank(folderData.getCode())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐩爣鏂囦欢澶归敊璇�");
+ }
+ folder = systemDictDataBiz.queryByCode(Constants.FTP,folder).getCode();
+ String prefixPath = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode();
+ response.setCharacterEncoding("UTF-8");
+ response.setContentType("text/html;charset=UTF-8");
+ Map<String, Object> context = new HashMap<>();
+ try {
+ if(ftp == null){
+ ftp = new FtpUtil(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_HOST).getCode(),
+ Integer.parseInt(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PORT).getCode()),
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_USERNAME).getCode(),
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PWD).getCode());
+ }else{
+ ftp.connect();
+ }
+
+ context.put("success", true);
+ context.put("code", 200);
+ context.put("errno",0);
+ CommonsMultipartResolver multipartResovler = new CommonsMultipartResolver();
+ if (multipartResovler.isMultipart(request)) {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ List<MultipartFile> fileList = multipartRequest.getFiles("file");
+ Iterator<String> it = multipartRequest.getFileNames();
+ JSONArray jsonArray = new JSONArray();
+
+ if (fileList.size() > 0) {
+ //閬嶅巻鏂囦欢鍒楄〃
+ Iterator<MultipartFile> fileIte = fileList.iterator();
+ Integer index = Constants.ONE;
+ while (fileIte.hasNext()) {
+ //鑾峰緱姣忎竴涓枃浠�
+ MultipartFile file = fileIte.next();
+ String originname = file.getOriginalFilename();
+ InputStream is = file.getInputStream();
+ String endType = originname.substring(originname.lastIndexOf("."), originname.length());
+ String date = DateUtil.getNowShortDate();
+ String fName = date + "/" + UUID.randomUUID() + endType;
+ String fileName = folder + fName;
+ boolean r = ftp.uploadInputstreamBatch(is, fileName, Constants.equalsInteger(index ,fileList.size()),index);
+ if (r) {
+ JSONObject fileJSON = new JSONObject();
+ fileJSON.put("url", prefixPath + fileName);
+ fileJSON.put("imgaddr", fName);
+ fileJSON.put("imgname", fileName);
+ fileJSON.put("originname", originname);
+ jsonArray.add(fileJSON);
+ }
+ index = index + 1;
+ }
+
+ }
+
+// while (it.hasNext()) {
+// MultipartFile file = multipartRequest.getFile(it.next());
+// String originname = file.getOriginalFilename();
+// is = file.getInputStream();
+// String 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){
+// JSONObject fileJSON = new JSONObject();
+// fileJSON.put("url", prefixPath+fileName);
+// fileJSON.put("imgaddr", fName);
+// fileJSON.put("imgname", fileName);
+// fileJSON.put("originname", originname);
+// jsonArray.add(fileJSON);
+// }
+// }
+ context.put("data",jsonArray);
+ }
+ } catch (Exception e) {
+ log.error("銆愪笂浼燜TP澶辫触銆�======================"+e.getMessage());
+ context.put("code", 0);
+ context.put("message", "涓婁紶澶辫触");
+ context.put("errno",0);
+ writerJson(response, context);
+ return;
+
+ }
+ writerJson(response, context);
+ return;
+ }
+
+ @ApiOperation(value = "涓嬭浇缃戠粶鏂囦欢")
+ @RequestMapping(method= RequestMethod.POST,value="/downloadFile")
+ @ResponseBody
+ public void downloadFile(@RequestBody DownloadFileDTO param, HttpServletRequest request, HttpServletResponse response) throws Exception {
+ if(StringUtils.isBlank(param.getUrl())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ InputStream inputStream = HttpsUtil.connectionInputsteam(param.getUrl(),"GET",null,null);
+ if(inputStream == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏂囦欢涓嬭浇澶辫触锛岃妫�鏌ユ枃浠惰矾寰勬槸鍚﹀悎娉曪紒");
+ }
+ if(StringUtils.isBlank(param.getFileName())){
+ param.setFileName(System.currentTimeMillis()+"");
+ if(param.getUrl().lastIndexOf(".") >0){
+ String nfix = param.getUrl().substring(param.getUrl().lastIndexOf("."));
+ param.setFileName(System.currentTimeMillis()+"."+nfix);
+ }
+ }
+
+ String encodeFileName = URLEncoder.encode(param.getFileName(), Charset.forName("UTF-8").toString());
+ response.setHeader("Content-Disposition","attachment;filename=" + encodeFileName);
+ response.setContentType("application/octet-stream");
+ response.setHeader("eva-opera-type", "download");
+ response.setHeader("eva-download-filename", encodeFileName);
+
+ OutputStream os = new BufferedOutputStream(response.getOutputStream());
+ byte[] buffer = new byte[4096];
+ int bytesRead;
+ while ((bytesRead = inputStream.read(buffer)) != -1) {
+ os.write(buffer, 0, bytesRead);
+ }
+ os.flush();
+ os.close();
+ inputStream.close();
+ }
@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;
response.setCharacterEncoding("UTF-8");
@@ -78,11 +223,47 @@
MultipartFile file = multipartRequest.getFile(it.next());
String originname = file.getOriginalFilename();
is = file.getInputStream();
+ String endType = ".jpg";
+ if(originname.indexOf(".")>0){
+ endType=originname.substring(originname.lastIndexOf("."),originname.length());
+ }
String date = DateUtil.getNowShortDate();
- String fName = date+"/"+ UUID.randomUUID()+".jpg";
+ 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);
@@ -91,11 +272,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;
}
}
@@ -203,9 +387,6 @@
e.printStackTrace();
}
}
-
-
-
public void uploadFileLocal(HttpServletRequest request, String folder, HttpServletResponse response, String rootPath,String dir) throws Exception {
response.setCharacterEncoding("UTF-8");
--
Gitblit v1.9.3