| 
					
				 | 
			
			
				@@ -58,7 +58,7 @@ public class UploadController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 String date = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 String filename = IdUtils.fastSimpleUUID() + image.getOriginalFilename().substring(image.getOriginalFilename().lastIndexOf(".")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                String format1 = dateFormat1.format(new Date(msgAlarm.getAlarmTime())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                String format1 = dateFormat1.format(msgAlarm.getAlarmTime()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 String imgName = msgAlarm.getAlarmLine() + "/" + lineType + "/" + msgAlarm.getAlarmMile() + format1 + "/" + filename; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 minioUtils.minIoClientUpload(image.getInputStream(), imgName); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 uploadFile = "/" + msgAlarm.getAlarmLine() + "/" + lineType + "/" + msgAlarm.getAlarmMile() + "/" + format1 + "/" + filename; 
			 |