From 013dd6e242a605f6dfa93eb8fc5591adfe01181e Mon Sep 17 00:00:00 2001 From: xiepeng Date: Tue, 4 Jun 2024 18:03:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comprehensive/AppTrafficSafetyMeetingController.java | 5 +++++ .../zcloud/controller/depository/TextLibraryController.java | 1 + .../service/depository/impl/TextLibraryServiceImpl.java | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java index 971238d..145f038 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java @@ -109,6 +109,11 @@ public class AppTrafficSafetyMeetingController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + if(pd.getString("LOCATIONADDRESS").contains("undefined")) { + String localhost = pd.getString("LOCATIONADDRESS").replace("undefined",""); + pd.put("LOCATIONADDRESS", localhost); + } + if (livePhoto != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){ String livePhotoPath = saveFile(livePhoto, pd); if (livePhotoPath != null) { diff --git a/src/main/java/com/zcloud/controller/depository/TextLibraryController.java b/src/main/java/com/zcloud/controller/depository/TextLibraryController.java index 162c7e0..576832f 100644 --- a/src/main/java/com/zcloud/controller/depository/TextLibraryController.java +++ b/src/main/java/com/zcloud/controller/depository/TextLibraryController.java @@ -21,6 +21,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.net.CacheRequest; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java b/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java index 85cb22d..3889663 100644 --- a/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java +++ b/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java @@ -163,7 +163,7 @@ public class TextLibraryServiceImpl implements TextLibraryService { String path = smb.saveFile(file[0]); condition.put("PATH", path); } - if (StringUtils.isNotBlank(condition.getString("BUS_TEXT_LIBRARY_ID"))) { + if (StringUtils.isNotBlank(condition.getString("BUS_TEXT_LIBRARY_ID")) && StringUtils.isEmpty(condition.getString("ISADD"))) { // 保存历史文件 PageData entity = textlibraryMapper.findById(condition); condition.put("REMOTE_FILE_NAME", Warden.getFileName(condition.getString("PATH")));