From 089a23ac48c7e08ca0b467240c74ef7fed38a374 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 14 一月 2025 11:49:28 +0800
Subject: [PATCH] 功能”最近信号强度“”最近电压低于指定值“查询数据中加上取水口经纬度
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 c8aedaa..35376d2 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){
+ private void dealWebFilePath(JSONArray jsonArray, boolean hasZipFile){
for (Object obj : jsonArray){
if(obj instanceof JSONObject){
JSONObject jsonObject = (JSONObject) obj;
@@ -55,6 +55,9 @@
FileRestVo fvo = fileOp.parseHashcode(fmUrl, Integer.valueOf(hashObj.toString()));
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")));
+ }
}
}
}
@@ -125,9 +128,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) ;
- this.dealWebFilePath(audios_array) ;
- this.dealWebFilePath(videos_array) ;
+ this.dealWebFilePath(images_array, true) ;
+ this.dealWebFilePath(audios_array, false) ;
+ this.dealWebFilePath(videos_array, true) ;
report.setImages(images_array);
report.setAudios(audios_array);
report.setVideos(videos_array);
--
Gitblit v1.8.0