From 427d87e5572d72d0e3aaa4364e4f53569222e321 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 25 三月 2025 21:40:05 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java
index 201247d..edd4f55 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java
@@ -48,7 +48,7 @@
@Autowired
private FileOperate fileOp ;
- private void dealWebFilePath(JSONArray jsonArray, boolean hasZipFile){
+ private void dealWebFilePath(JSONArray jsonArray, boolean hasZipFile, boolean isVideo){
for (Object obj : jsonArray){
if(obj instanceof JSONObject){
JSONObject jsonObject = (JSONObject) obj;
@@ -58,7 +58,11 @@
if(fvo != null && fvo.fileWebUrl != null){
jsonObject.put("webPath", fvo.fileWebUrl + jsonObject.get("filePath"));
if(hasZipFile){
- jsonObject.put("webPathZip", fileOp.getFileZipPath(fvo.fileWebUrl + jsonObject.get("filePath")));
+ if(!isVideo){
+ jsonObject.put("webPathZip", fileOp.getFileZipPath(fvo.fileWebUrl + jsonObject.get("filePath")));
+ }else{
+ jsonObject.put("webPathZip", fileOp.getFileZipPath(fvo.fileWebUrl + jsonObject.get("filePath"), "jpg"));
+ }
}
}
}
@@ -121,9 +125,9 @@
JSONArray images_array = Optional.ofNullable(JSON.parseArray(report_temp.getImages())).orElse(new JSONArray());
JSONArray audios_array = Optional.ofNullable(JSON.parseArray(report_temp.getAudios())).orElse(new JSONArray());
JSONArray videos_array = Optional.ofNullable(JSON.parseArray(report_temp.getVideos())).orElse(new JSONArray());
- this.dealWebFilePath(images_array, true) ;
- this.dealWebFilePath(audios_array, false) ;
- this.dealWebFilePath(videos_array, true) ;
+ this.dealWebFilePath(images_array, true, false) ;
+ this.dealWebFilePath(audios_array, false, false) ;
+ this.dealWebFilePath(videos_array, true, true) ;
report.setImages(images_array);
report.setAudios(audios_array);
report.setVideos(videos_array);
@@ -149,9 +153,9 @@
JSONArray images_array = Optional.ofNullable(JSON.parseArray(issueReport.getImages())).orElse(new JSONArray());
JSONArray audios_array = Optional.ofNullable(JSON.parseArray(issueReport.getAudios())).orElse(new JSONArray());
JSONArray videos_array = Optional.ofNullable(JSON.parseArray(issueReport.getVideos())).orElse(new JSONArray());
- this.dealWebFilePath(images_array, true) ;
- this.dealWebFilePath(audios_array, false) ;
- this.dealWebFilePath(videos_array, true) ;
+ this.dealWebFilePath(images_array, true, false) ;
+ this.dealWebFilePath(audios_array, false, false) ;
+ this.dealWebFilePath(videos_array, true, true) ;
report.setImages(images_array);
report.setAudios(audios_array);
--
Gitblit v1.8.0