From 1cad14bca191807e18705c3a5526eda8151be439 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 14 四月 2025 23:10:22 +0800
Subject: [PATCH] 批量审核和图片保存bug
---
ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java | 191 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 163 insertions(+), 28 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java b/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java
index 05f98c7..206ea90 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java
@@ -2,35 +2,53 @@
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.xxpt.gateway.shared.api.request.OapiMediaUploadRequest;
+import com.alibaba.xxpt.gateway.shared.api.response.OapiMediaUploadResponse;
import com.alibaba.xxpt.gateway.shared.client.http.ExecutableClient;
import com.alibaba.xxpt.gateway.shared.client.http.GetClient;
+import com.alibaba.xxpt.gateway.shared.client.http.IntelligentPostClient;
import com.alibaba.xxpt.gateway.shared.client.http.PostClient;
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.common.utils.StringUtils;
+import com.aliyun.oss.model.ObjectMetadata;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
import com.ycl.common.dingding.DingCommon;
+import com.ycl.config.DdTest;
import com.ycl.config.DingConfig;
import com.ycl.controller.BaseController;
+import com.ycl.dto.video.OssFileDto;
import com.ycl.entity.dingding.DingUserInfo;
import com.ycl.service.auth.AuthService;
import com.ycl.service.ding.BookRemarkService;
import com.ycl.service.ding.DingService;
+import com.ycl.service.oss.OssService;
+import com.ycl.utils.ConstantPropertiesUtils;
+import com.ycl.utils.common.RandomUtils;
import com.ycl.vo.AddressBookVO;
import com.ycl.vo.NewAddressBookVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
import javax.annotation.Resource;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -70,13 +88,18 @@
private DingConfig dingConfig;
+ @Autowired
+ private OssService ossService;
+
@ApiOperation(value = "鏍规嵁閽夐拤鎺堟潈鐮佽幏鍙杢oken")
@GetMapping("/dingLogin")
public CommonResult<Map> dingLogin(@RequestParam String code) {
+ log.info("涓�閿櫥褰曞弬鏁癱ode--------------->{}", code);
HashMap<String, Object> map = new HashMap<>();
//鑾峰彇鐢ㄦ埛淇℃伅
DingUserInfo dingUser = dingCommon.getDingUserInfo(code);
//鎸塪ing鐧诲綍
+ log.info("鐢ㄦ埛淇℃伅------------------->{}", dingUser);
String token = authService.dingLogin(dingUser);
map.put("token", token);
map.put("tokenHead", tokenHead);
@@ -169,47 +192,159 @@
return CommonResult.success(bookRemarkService.updateRemark(user, userId, remark));
}
- private String getVideo(String accToken) {
+
+ @PostMapping("/oss/sign")
+ public CommonResult ossSign(@RequestBody OssFileDto dto) {
+
+ if (StringUtils.isNullOrEmpty(dto.getMediaId()) || StringUtils.isNullOrEmpty(dto.getExtension())) {
+ return CommonResult.failed("鍙傛暟涓嶈兘涓虹┖锛�");
+ }
+ ExecutableClient executableClient = DdTest.getExecutableClient();
CloseableHttpResponse response = null;
- //璋冪敤API
- GetClient getClient = executableClient.newGetClient(GET_VIDEO);
- //璁剧疆鍙傛暟
+ OSS ossClient = null;
+
+ DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+ System.out.println("寮�濮嬭幏鍙�--" + dtf2.format(LocalDateTime.now()));
try {
- if (ObjectUtil.isNotNull(accToken)) {
- getClient.addParameter("accessToken", accToken);
- getClient.addParameter("mediaId", dingConfig.getMediaId());
-// String result = getClient.get();
-// return parsingResult(result);
+ //浠庨拤閽夎幏鍙栬棰戞祦
+ String api = "/media/download";
+ GetClient getClient = executableClient.newGetClient(api);
+ //浠巖edis鑾峰彇token
+ String token = getToken();
+ //璁剧疆鍙傛暟
+ getClient.addParameter("access_token", token);
+ getClient.addParameter("media_id", dto.getMediaId());
response = getClient.getB();
HttpEntity entity = response.getEntity();
InputStream is = entity.getContent();
- File voice = new File("/Users/video/log1.xlsx");
- OutputStream fos = new FileOutputStream(voice);
- int cache = 10 * 1024;
- byte[] buffer = new byte[cache];
- int ch = 0;
- while ((ch = is.read(buffer)) != -1) {
- fos.write(buffer, 0, ch);
- }
- is.close();
- fos.flush();
- fos.close();
- }
+
+// MultipartFile file = getMultipartFile(is, fileName);
+
+ String url = ossService.uploadImages(is, dto.getExtension(),0);
+ return CommonResult.success(url);
} catch (Exception e) {
e.printStackTrace();
- }finally {
+ System.out.println(e.getMessage());
+ } finally {
+ if (ossClient != null) {
+ ossClient.shutdown();
+ }
if (response != null) {
try {
- //鐗瑰埆鎻愰啋锛氶渶瑕佽皟鐢╮esponse鐨刢lose鏂规硶鍏抽棴缃戠粶杩炴帴锛侊紒锛�
response.close();
} catch (Exception e) {
- e.printStackTrace();
+ System.out.println(e);
}
}
}
return null;
}
+ @ApiOperation(value = "鑾峰彇瑙嗛")
+ @GetMapping("/getVideo/{mediaId}")
+ public CommonResult<String> getVideo(@PathVariable String mediaId) {
+ String accessToken = getToken();
+
+ MultipartFile file = getDownload(accessToken, mediaId);
+ String url = ossService.uploadImages(file);
+ return CommonResult.success(url);
+ }
+ private MultipartFile getDownload(String access_token, String media_id) {
+ CloseableHttpResponse response = null;
+ try {
+ String api = "/media/download";
+ GetClient getClient = executableClient.newGetClient(api);
+ //璁剧疆鍙傛暟
+ getClient.addParameter("access_token", access_token);
+ getClient.addParameter("media_id", media_id);
+
+ response = getClient.getB();
+ HttpEntity entity = response.getEntity();
+ InputStream is = entity.getContent();
+
+ DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+
+ String strDate2 = dtf2.format(LocalDateTime.now());
+ String fileName = strDate2 + RandomUtils.generateRandomInt(4) + ".MOV";
+ return getMultipartFile(is, fileName);
+
+ } catch (Exception e) {
+ System.out.println(e);
+ } finally {
+ if (response != null) {
+ try {
+ //鐗瑰埆鎻愰啋锛氶渶瑕佽皟鐢╮esponse鐨刢lose鏂规硶鍏抽棴缃戠粶杩炴帴锛侊紒锛�
+ response.close();
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 鑾峰彇灏佽寰桵ultipartFile
+ *
+ * @param inputStream inputStream
+ * @param fileName fileName
+ * @return MultipartFile
+ */
+ public MultipartFile getMultipartFile(InputStream inputStream, String fileName) {
+ FileItem fileItem = createFileItem(inputStream, fileName);
+ //CommonsMultipartFile鏄痜eign瀵筸ultipartFile鐨勫皝瑁咃紝浣嗘槸瑕丗ileItem绫诲璞�
+ return new CommonsMultipartFile(fileItem);
+ }
+
+
+ /**
+ * FileItem绫诲璞″垱寤�
+ *
+ * @param inputStream inputStream
+ * @param fileName fileName
+ * @return FileItem
+ */
+ public FileItem createFileItem(InputStream inputStream, String fileName) {
+ FileItemFactory factory = new DiskFileItemFactory(16, null);
+ DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ String strDate2 = dtf2.format(LocalDateTime.now());
+ String textFieldName = strDate2 + RandomUtils.generateRandomInt(4);
+ FileItem item = factory.createItem(textFieldName, MediaType.MULTIPART_FORM_DATA_VALUE, true, fileName);
+ int bytesRead = 0;
+ byte[] buffer = new byte[8192];
+ OutputStream os = null;
+ //浣跨敤杈撳嚭娴佽緭鍑鸿緭鍏ユ祦鐨勫瓧鑺�
+ try {
+ os = item.getOutputStream();
+ while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) {
+ os.write(buffer, 0, bytesRead);
+ }
+ inputStream.close();
+ } catch (IOException e) {
+ log.error("Stream copy exception", e);
+ throw new IllegalArgumentException("鏂囦欢涓婁紶澶辫触");
+ } finally {
+ if (os != null) {
+ try {
+ os.close();
+ } catch (IOException e) {
+ log.error("Stream close exception", e);
+
+ }
+ }
+ if (inputStream != null) {
+ try {
+ inputStream.close();
+ } catch (IOException e) {
+ log.error("Stream close exception", e);
+ }
+ }
+ }
+
+ return item;
+ }
}
+
--
Gitblit v1.8.0