|
@@ -99,12 +99,12 @@ public class UploadController {
|
|
|
|
|
|
String imageName = stream.getOriginalFilename();
|
|
|
if (StringUtils.isNotBlank(imageName)) {
|
|
|
- String filename = IdUtils.fastSimpleUUID() + stream.getOriginalFilename().substring(stream.getOriginalFilename().lastIndexOf("."));
|
|
|
+// String filename = IdUtils.fastSimpleUUID() + stream.getOriginalFilename().substring(stream.getOriginalFilename().lastIndexOf("."));
|
|
|
SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
String format1 = dateFormat1.format(new Date());
|
|
|
- String imgName = alarmRailway + "/" + lineDir + "/" + alarmMile + "/" + format1 + "/" + filename;
|
|
|
+ String imgName = alarmRailway + "/" + lineDir + "/" + alarmMile + "/" + format1 + "/" + imageName;
|
|
|
minioUtils.minIoClientUpload(stream.getInputStream(), imgName);
|
|
|
- uploadFile = imgUrl+"/" + alarmRailway + "/" + lineDir + "/" + alarmMile + "/" + format1 + "/" + filename;
|
|
|
+ uploadFile = imgUrl+"/" + alarmRailway + "/" + lineDir + "/" + alarmMile + "/" + format1 + "/" + imageName;
|
|
|
}
|
|
|
} else {
|
|
|
jsonObject.put("resultCode", 0);
|