diff --git a/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java index 7516700..0918f8c 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java @@ -166,15 +166,11 @@ public class ImageServiceImpl extends ServiceImpl impl String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); String path_prefix = permPath.concat(imageSource).concat(FileUtil.FILE_SEPARATOR).concat(dateStr).concat(FileUtil.FILE_SEPARATOR); if (Objects.nonNull(imageWorkReq)) { - if (StrUtil.isNotBlank(imageWorkReq.getUploadUser())) { - path_prefix = path_prefix.concat(imageWorkReq.getUploadUser()).concat(FileUtil.FILE_SEPARATOR); - } - if (StrUtil.isNotBlank(imageWorkReq.getLongitude())) { - path_prefix = path_prefix.concat(imageWorkReq.getLongitude()) - .concat(" ").concat(StrUtil.nullToDefault(imageWorkReq.getLatitude(), "0")) - .concat(" ").concat(StrUtil.nullToDefault(imageWorkReq.getAltitude(), "0")) - .concat(FileUtil.FILE_SEPARATOR); - } + path_prefix = path_prefix.concat(StrUtil.nullToDefault(imageWorkReq.getUploadUser(), "默认用户")).concat(FileUtil.FILE_SEPARATOR) + .concat(StrUtil.nullToDefault(imageWorkReq.getLongitude(), "0")) + .concat(" ").concat(StrUtil.nullToDefault(imageWorkReq.getLatitude(), "0")) + .concat(" ").concat(StrUtil.nullToDefault(imageWorkReq.getAltitude(), "0")) + .concat(FileUtil.FILE_SEPARATOR); } if (!FileUtil.exist(path_prefix)) { FileUtil.mkdir(path_prefix); @@ -344,9 +340,11 @@ public class ImageServiceImpl extends ServiceImpl impl } } else { List gps = StrUtil.split(split.get(5), " "); - resp.setLongitude(gps.get(0)); - resp.setLatitude(gps.get(1)); - resp.setAltitude(gps.get(2)); + if (gps.size() > 1) { + resp.setLongitude(gps.get(0)); + resp.setLatitude(gps.get(1)); + resp.setAltitude(gps.get(2)); + } } resp.setUploadUser(split.get(4)); resp.setImageSource(split.get(2));