From eaf4587b47701f3df0559e64362d6ea413d782f3 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 11 十月 2024 10:41:49 +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 | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 105 insertions(+), 10 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..44d9f8c 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,13 +1,18 @@
package com.doumee.cloud.common;
+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.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.FtpUtil;
import com.doumee.core.utils.aliyun.ALiYunUtil;
+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;
@@ -26,10 +31,7 @@
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.util.*;
/**
* @author Eva.Caesar Liu
@@ -41,8 +43,6 @@
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/public")
@Slf4j
public class PublicCloudController extends BaseController {
-
-
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -50,11 +50,108 @@
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 = "涓婁紶鏂囦欢鍒癋TP")
@RequestMapping(method= RequestMethod.POST,value="/upload")
@ResponseBody
public void upload(HttpServletRequest request, HttpServletResponse response, String folder) throws Exception {
// folder = systemDictDataBiz.queryByCode(Constants.FTP,folder).getCode();
+ folder =StringUtils.defaultString(folder).replace("/", "");
String prefixPath = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode();
InputStream is = null;
response.setCharacterEncoding("UTF-8");
@@ -78,8 +175,9 @@
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()+".jpg";
+ String fName = date+"/"+ UUID.randomUUID()+endType;
String fileName = folder+"/"+fName;
boolean r = ftp.uploadInputstream(is,fileName);
if(r){
@@ -203,9 +301,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