he2802 3 жил өмнө
parent
commit
2430a2050f

+ 3 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/alioss/service/impl/OssServiceImpl.java

@@ -104,11 +104,13 @@ public class OssServiceImpl implements OssService {
 
     public String generateRandomFilename(OssRequest ossRequest) {
         String prefixName = "";
+        boolean haveGrade = false;
         if(Validator.isNotEmpty(ossRequest.getUserId())&&ossRequest.getUserId().longValue()>0){
             prefixName = prefixName + ossRequest.getUserId()+"/";
         }
         if(Validator.isNotEmpty(ossRequest.getGradeId())&&ossRequest.getGradeId().longValue()>0){
             prefixName = prefixName + ossRequest.getGradeId()+"/";
+            haveGrade = true;
         }
         String RandomFilename = "";
         //生成随机数
@@ -124,7 +126,7 @@ public class OssServiceImpl implements OssService {
         RandomFilename = now + String.valueOf(random > 0 ? random : (-1) * random);
         switch(ossRequest.getImageStatus()){
             case 0 :
-                RandomFilename = "avatar"+"/"+prefixName+sdf.format(new Date())+"/"+now;
+                RandomFilename = "avatar"+"/"+prefixName+ (haveGrade?"":(sdf.format(new Date())+"/"))+now;
                 break;
             case 1 :
                 RandomFilename = "IDNumber"+"/"+prefixName+sdf.format(new Date())+"/"+now;