diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java index 83b2359d0..a15192ff6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java @@ -77,10 +77,7 @@ public class PileFirmwareInfoServiceImpl implements PileFirmwareInfoService { @Override public int insertPileFirmwareInfo(PileFirmwareInfo pileFirmwareInfo) { // pileFirmwareInfo.setCreateTime(DateUtils.getNowDate()); - String filePath = pileFirmwareInfo.getFilePath(); - // 两个斜杠 留一个 - filePath = filePath.replaceAll("//", "/"); - pileFirmwareInfo.setFilePath(filePath); + pileFirmwareInfo.setFilePath(normalizeFilePath(pileFirmwareInfo.getFilePath())); return pileFirmwareInfoMapper.insertPileFirmwareInfo(pileFirmwareInfo); } @@ -99,10 +96,19 @@ public class PileFirmwareInfoServiceImpl implements PileFirmwareInfoService { */ @Override public int updatePileFirmwareInfo(PileFirmwareInfo pileFirmwareInfo) { + pileFirmwareInfo.setFilePath(normalizeFilePath(pileFirmwareInfo.getFilePath())); pileFirmwareInfo.setUpdateTime(DateUtils.getNowDate()); return pileFirmwareInfoMapper.updatePileFirmwareInfo(pileFirmwareInfo); } + private String normalizeFilePath(String filePath) { + if (StringUtils.isBlank(filePath)) { + return filePath; + } + // 两个斜杠留一个,兼容固件上传接口返回的相对路径。 + return filePath.replaceAll("//", "/"); + } + /** * 批量删除充电桩固件信息 *