From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/company/src/main/java/com/doumee/api/common/PublicController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/common/PublicController.java b/server/company/src/main/java/com/doumee/api/common/PublicController.java
index 10c9278..d8754cb 100644
--- a/server/company/src/main/java/com/doumee/api/common/PublicController.java
+++ b/server/company/src/main/java/com/doumee/api/common/PublicController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.annotation.excel.ExcelToPdfTool;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
@@ -16,6 +17,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -45,7 +47,12 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
-
+ @ApiOperation("娴嬭瘯")
+ @PostMapping("/testPdf")
+ public String testPdf(@RequestParam Map<String,String> req, HttpServletResponse response) {
+ ExcelToPdfTool.excelToPdf(req.get("f1"),req.get("f2"));
+ return JSONObject.toJSONString(req);
+ }
@ApiOperation(value = "涓婁紶", notes = "涓婁紶", httpMethod = "POST", position = 6)
@ApiImplicitParams({
@@ -129,6 +136,17 @@
String tempFileName = nowDate + "/" + fileName;
String key = folder + tempFileName;// 鏂囦欢鍚�
ALiYunUtil obs = new ALiYunUtil(endpoint,access_id, access_key);
+ int type = 2;
+ if(StringUtils.endsWith(key,".mp4")){
+ type =1;
+ }else if(StringUtils.endsWith(key,".jpg")
+ || StringUtils.endsWith(key,".JPG")
+ || StringUtils.endsWith(key,".png")
+ || StringUtils.endsWith(key,".PNG")
+ || StringUtils.endsWith(key,".jpeg")
+ || StringUtils.endsWith(key,".JPEG")){
+ type =0;
+ }
if (obs.uploadOnlineObject(file.getInputStream(),bucketName, key,null)) {
// 绉诲姩鎴愬姛,杩斿洖鏂囦欢鍚�
// sendSuccessMessage(response, resourcePath+key);
@@ -139,6 +157,7 @@
fileJSON.put("url", resourcePath + key);
fileJSON.put("imgaddr", tempFileName);
fileJSON.put("imgname", fileName);
+ fileJSON.put("type", type);
fileJSON.put("originname", originname);
context.put("data",fileJSON);
context.put("message","璇锋眰鎴愬姛");
@@ -286,7 +305,6 @@
if (true) {
// 鍏抽棴FTP娴�
// 绉诲姩鎴愬姛,杩斿洖鏂囦欢鍚�
-
/*context.put("error", 0);
context.put("url", remoteFileName);
context.put("fullurl", remoteFileName);
--
Gitblit v1.9.3