From 211789ba1102a46fd19e75c2643c7ed416ec9e8a Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 22 十月 2024 17:33:06 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileConstant.java | 2 ++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileOperate.java | 28 ++++++++++++++++++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/fm/FmCtrl.java | 6 +++---
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 6 ++++++
4 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileConstant.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileConstant.java
index 2450546..c9d7f6a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileConstant.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileConstant.java
@@ -12,6 +12,8 @@
public static final String fmPostMapping_parsePathList_paramName = "filePaths" ;//鍙傛暟鍚嶇О
public static final String fmPostMapping_parseHashcode = "parseHashcode" ;//鏂规硶璺緞
public static final String fmPostMapping_parseHashcode_paramName = "hashCode" ;//鍙傛暟鍚嶇О
+ public static final String fmPostMapping_parseHashcodeList = "parseHashcodeList" ;//鏂规硶璺緞
+ public static final String fmPostMapping_parseHashcodeList_paramName = "hashCodes" ;//鍙傛暟鍚嶇О
public static final String fileRequestMapping = "file" ;//controller 璺緞
public static final String filePostMapping_photo = "savePhoto" ;//鏂规硶璺緞
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileOperate.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileOperate.java
index ae52a49..f4132ec 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileOperate.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileOperate.java
@@ -277,6 +277,34 @@
}
/**
+ * 瑙ｆ瀽鏂囦欢鍝堝笇鍊�
+ * @param fmUrl
+ * @param hashCodes
+ * @return
+ */
+ public List<FileRestVo> parseHashcode(String fmUrl, List<Integer> hashCodes){
+ List<FileRestVo> rList = null ;
+ if(hashCodes != null && hashCodes.size() > 0) {
+ // 鍑嗗璇锋眰鏁版嵁
+ MultiValueMap<String, Object> multipartRequestData = new LinkedMultiValueMap<>();
+ multipartRequestData.add(FileConstant.fmPostMapping_parseHashcodeList_paramName, hashCodes);
+
+ // 璁剧疆璇锋眰澶撮儴锛岃繖閲屽亣璁炬湇鍔″櫒鎺ユ敹multipart/form-data绫诲瀷鐨勬暟鎹�
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+
+ // 灏佽璇锋眰浣�
+ HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(multipartRequestData, headers);
+
+ String webUrl = fmUrl + "/" + FileConstant.fmRequestMapping + "/" + FileConstant.fmPostMapping_parseHashcodeList;
+ // 鍙戦�丳OST璇锋眰
+ FileRestVo[] rvos = restTemplate.postForObject(webUrl, requestEntity, FileRestVo[].class);
+ rList = Arrays.asList(rvos) ;
+ }
+ return rList ;
+ }
+
+ /**
* 瑙ｆ瀽鏂囦欢鏂囦欢璺緞涓殑鍝堝笇鍊煎苟杩斿洖鍥剧墖瀹屾暣璺緞
* @param fmUrl
* @param filePath
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 46e2aab..4f4e784 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -1,3 +1,9 @@
+spring:
+ servlet:
+ multipart:
+ # 鍓嶇涓婁紶鏂囦欢锛岄檺鍒跺崟涓枃浠剁殑澶у皬鍜岄檺鍒舵墍鏈夋枃浠剁殑澶у皬
+ max-file-size: 500MB
+ max-request-size: 5000MB
logging:
charset:
console: UTF-8
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/fm/FmCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/fm/FmCtrl.java
index 4e22515..64d7d15 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/fm/FmCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/fm/FmCtrl.java
@@ -134,15 +134,15 @@
* @param hashCodes
* @return 鏂囦欢鏈嶅姟鍣ㄥ睘鎬у璞￠泦鍚�
*/
- @PostMapping(path = "parseHashcodes")
- public List<FileRestVo> parseHashcodes(List<Integer> hashCodes){
+ @PostMapping(path = "parseHashcodeList")
+ public FileRestVo[] parseHashcodeList(List<Integer> hashCodes){
List<FileRestVo> reList = new ArrayList<>() ;
if(hashCodes != null && hashCodes.size() > 0){
for(Integer hashCode : hashCodes){
reList.add(parseHashcode(hashCode)) ;
}
}
- return reList ;
+ return reList.toArray(new FileRestVo[0]) ;
}
--
Gitblit v1.8.0