From 2c2e89725c5ceeeaa141e4810d675aa87f9269fe Mon Sep 17 00:00:00 2001 From: wangzhijiang <1358525938@qq.com> Date: Fri, 29 Mar 2024 17:49:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=AF=94=E4=BA=9A?= =?UTF-8?q?=E8=BF=AA-=E4=B8=8B=E8=BD=BD=E6=AF=94=E4=BA=9A=E8=BF=AA?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BC=A0?= =?UTF-8?q?=E5=8F=82=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=8C=89=E7=85=A7=E4=BB=96?= =?UTF-8?q?=E4=BB=AC=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=94=B9=E6=88=90?= =?UTF-8?q?URL=E4=BC=A0=E5=8F=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../split/service/impl/FileSpiltService.java | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index c5945ff..4fbd643 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -61,6 +61,7 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; import org.springframework.core.io.Resource; +import org.springframework.web.util.UriComponentsBuilder; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -221,19 +222,24 @@ public class FileSpiltService { try { // 根据byd传过来的文件下载路径获取文件。 RestTemplate restTemplate = new RestTemplate(); - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_JSON); - - // 创建MultiValueMap对象，用于存储请求参数 - MultiValueMap params = new LinkedMultiValueMap<>(); - String fileId = sarFileSplitInfoEO.getId(); - params.add("fileId", fileId); - - // 使用HttpEntity对象包装请求体和请求头 - HttpEntity> requestEntity = new HttpEntity<>(params, headers); +// HttpHeaders headers = new HttpHeaders(); +// headers.setContentType(MediaType.APPLICATION_JSON); +// +// // 创建MultiValueMap对象，用于存储请求参数 +// MultiValueMap params = new LinkedMultiValueMap<>(); +// String fileId = sarFileSplitInfoEO.getId(); +// params.add("fileId", fileId); +// +// // 使用HttpEntity对象包装请求体和请求头 +// HttpEntity> requestEntity = new HttpEntity<>(params, headers); +// +// // 发送POST请求并获取响应 +// ResponseEntity responseEntity = restTemplate.postForEntity(bydDownLoadFileUrl, requestEntity, byte[].class); + Long fileId = Long.valueOf(sarFileSplitInfoEO.getId()); + UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(bydDownLoadFileUrl).queryParam("fileId", fileId); // 发送POST请求并获取响应 - ResponseEntity responseEntity = restTemplate.postForEntity(bydDownLoadFileUrl, requestEntity, byte[].class); + ResponseEntity responseEntity = restTemplate.postForEntity(builder.toUriString(), null, byte[].class); // 获取文件流 splitFileIs = new ByteArrayInputStream(responseEntity.getBody()); }catch (Exception ex){ From 91a570f21a0a2d459e5418d9d98a5bd83858b4cc Mon Sep 17 00:00:00 2001 From: wangzhijiang <1358525938@qq.com> Date: Fri, 29 Mar 2024 17:54:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=AF=94=E4=BA=9A?= =?UTF-8?q?=E8=BF=AA-=E4=B8=8B=E8=BD=BD=E6=AF=94=E4=BA=9A=E8=BF=AA?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BC=A0?= =?UTF-8?q?=E5=8F=82=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=8C=89=E7=85=A7=E4=BB=96?= =?UTF-8?q?=E4=BB=AC=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=94=B9=E6=88=90?= =?UTF-8?q?URL=E4=BC=A0=E5=8F=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/split/service/impl/FileSpiltService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index 8dfef8b..9dd5c46 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -61,6 +61,7 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; import org.springframework.core.io.Resource; +import org.springframework.web.util.UriComponentsBuilder; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -235,7 +236,12 @@ public class FileSpiltService { HttpEntity> requestEntity = new HttpEntity<>(params, headers); // 发送POST请求并获取响应 - ResponseEntity responseEntity = restTemplate.postForEntity(bydDownLoadFileUrl, requestEntity, byte[].class); +// ResponseEntity responseEntity = restTemplate.postForEntity(bydDownLoadFileUrl, requestEntity, byte[].class); + + Long fileIdLong = Long.valueOf(sarFileSplitInfoEO.getId()); + UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(bydDownLoadFileUrl).queryParam("fileId", fileIdLong); + // 发送POST请求并获取响应 + ResponseEntity responseEntity = restTemplate.postForEntity(builder.toUriString(), requestEntity, byte[].class); // 获取文件流 splitFileIs = new ByteArrayInputStream(responseEntity.getBody()); }catch (Exception ex){ From b5fb08eae9255a5a8c2ba72cb49b649cd89f6e77 Mon Sep 17 00:00:00 2001 From: wangzhijiang <1358525938@qq.com> Date: Mon, 1 Apr 2024 11:33:51 +0800 Subject: [PATCH 3/3] update --- .../onlyoffice/service/impl/BusProcessModelHisServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java index 4de8243..5293ef3 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java @@ -526,8 +526,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl