From a0a525d59f1cb3167a54af9309c8dab162e89005 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 12 六月 2025 19:23:32 +0800
Subject: [PATCH] 优化巡检和维修器件的图片路径
---
src/main/java/com/whyc/service/AlarmInspectionService.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/AlarmInspectionService.java b/src/main/java/com/whyc/service/AlarmInspectionService.java
index decc0bb..1f90efa 100644
--- a/src/main/java/com/whyc/service/AlarmInspectionService.java
+++ b/src/main/java/com/whyc/service/AlarmInspectionService.java
@@ -48,7 +48,9 @@
String stationName = result.getStationName();
Date now = new Date();
String timeFormat = ThreadLocalUtil.format(ThreadLocalUtil.TIME_YYYY_MM_DD_HH_MM_SS_UNION, now);
- String fileDirPath = CommonUtil.getRootFile() + "alarmInspection" + File.separator + stationName + "_" + timeFormat;
+ String dirMonth = ThreadLocalUtil.format(ThreadLocalUtil.TIME_YYYY_MM, now);
+
+ String fileDirPath = CommonUtil.getRootFile() + "alarmInspection" + File.separator + dirMonth + File.separator + stationName + "_" + timeFormat;
File fileDir = new File(fileDirPath);
//濡傛灉鏂囦欢澶逛笉瀛樺湪鍒欏垱寤�
if (!fileDir.exists()) {
@@ -56,7 +58,8 @@
}
StringBuilder pictureUrlSb = new StringBuilder();
if (file != null && file.size() > 0) {
- for (MultipartFile multipartFile : file) {
+ for (int j = 0; j < file.size(); j++) {
+ MultipartFile multipartFile = file.get(j);
String fileName = multipartFile.getOriginalFilename();
//灏唂ileName涓彲鑳藉瓨鍦ㄧ殑,鍘绘帀
fileName = fileName.replace(",","");
@@ -64,7 +67,13 @@
multipartFile.transferTo(new File(filePath));
String split = "pis_file"+File.separator+"alarmInspection";
- pictureUrlSb.append(File.separator + filePath.substring(filePath.indexOf(split))).append(",");
+ String picUrl = File.separator + filePath.substring(filePath.indexOf(split));
+ //鏈�鍚庝竴涓厓绱�
+ if (j == file.size() - 1) {
+ pictureUrlSb.append(picUrl);
+ }else {
+ pictureUrlSb.append(picUrl).append(",");
+ }
}
}
result.setPictureUrl(pictureUrlSb.toString());
--
Gitblit v1.9.1