wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

优化BUG

dev
xiepeng 2024-06-04 18:03:08 +08:00
parent 0d7b34fe6e
commit 013dd6e242
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java
View File

@ -109,6 +109,11 @@ public class AppTrafficSafetyMeetingController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 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"))){ if (livePhoto != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){
String livePhotoPath = saveFile(livePhoto, pd); String livePhotoPath = saveFile(livePhoto, pd);
if (livePhotoPath != null) { if (livePhotoPath != null) {

1
src/main/java/com/zcloud/controller/depository/TextLibraryController.java
View File

@ -21,6 +21,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.net.CacheRequest;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;

2
src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java
View File

@ -163,7 +163,7 @@ public class TextLibraryServiceImpl implements TextLibraryService {
String path = smb.saveFile(file[0]); String path = smb.saveFile(file[0]);
condition.put("PATH", path); 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); PageData entity = textlibraryMapper.findById(condition);
condition.put("REMOTE_FILE_NAME", Warden.getFileName(condition.getString("PATH"))); condition.put("REMOTE_FILE_NAME", Warden.getFileName(condition.getString("PATH")));