From e5c29d6ac2b210a9385723598d79a42ae5a9679e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 23 四月 2025 15:20:13 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java
index 35376d2..7fc6ea1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java
@@ -46,7 +46,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;
@@ -56,14 +56,17 @@
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"));
+ }
}
}
}
}
}
}
-
/**
* 娣诲姞鐢ㄦ埛闂涓婃姤
* @param po
@@ -128,9 +131,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);
--
Gitblit v1.8.0