学习路径

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

@@ -104,13 +104,11 @@ 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()+"/";
+            prefixName = prefixName + ossRequest.getUserId();
         }
         if(Validator.isNotEmpty(ossRequest.getGradeId())&&ossRequest.getGradeId().longValue()>0){
-            prefixName = prefixName + ossRequest.getGradeId()+"/";
-            haveGrade = true;
+            prefixName = prefixName + "/" + ossRequest.getGradeId();
         }
         String RandomFilename = "";
         //生成随机数
@@ -126,28 +124,28 @@ public class OssServiceImpl implements OssService {
         RandomFilename = now + String.valueOf(random > 0 ? random : (-1) * random);
         switch(ossRequest.getImageStatus()){
             case 0 :
-                RandomFilename = "avatar"+"/"+prefixName+ (haveGrade?"":(sdf.format(new Date())+"/"))+now;
+                RandomFilename = "avatar"+"/"+prefixName+(Validator.isNotEmpty(prefixName)?"":(sdf.format(new Date())+"/"+now));
                 break;
             case 1 :
-                RandomFilename = "IDNumber"+"/"+prefixName+sdf.format(new Date())+"/"+now;
+                RandomFilename = "IDNumber"+"/"+prefixName+(Validator.isNotEmpty(prefixName)?"":(sdf.format(new Date())+"/"+now));
                 break;
             case 2 :
-                RandomFilename = "QuestionBank"+prefixName+sdf.format(new Date())+"/"+now;
+                RandomFilename = "QuestionBank"+"/"+prefixName+(Validator.isNotEmpty(prefixName)?"":(sdf.format(new Date())+"/"+now));
                 break;
             case 3 :
-                RandomFilename = "guide"+"/"+prefixName+sdf.format(new Date())+"/"+now;
+                RandomFilename = "guide"+"/"+prefixName+(Validator.isNotEmpty(prefixName)?"":(sdf.format(new Date())+"/"+now));
                 break;
             case 4 :
-                RandomFilename = "advertising"+prefixName+sdf.format(new Date())+"/"+now;
+                RandomFilename = "advertising"+"/"+prefixName+(Validator.isNotEmpty(prefixName)?"":(sdf.format(new Date())+"/"+now));
                 break;
             case 5 :
-                RandomFilename = "IDCard"+"/"+prefixName+sdf.format(new Date())+"/"+now;
+                RandomFilename = "IDCard"+"/"+prefixName+(Validator.isNotEmpty(prefixName)?"":(sdf.format(new Date())+"/"+now));
                 break;
             case 6 :
-                RandomFilename = "file"+"/"+prefixName+sdf.format(new Date())+"/"+now;
+                RandomFilename = "file"+"/"+prefixName+(Validator.isNotEmpty(prefixName)?"":(sdf.format(new Date())+"/"+now));
                 break;
             case 7 :
-                RandomFilename = "certificate"+"/"+prefixName+sdf.format(new Date())+"/"+now;
+                RandomFilename = "certificate"+"/"+prefixName+(Validator.isNotEmpty(prefixName)?"":(sdf.format(new Date())+"/"+now));
                 break;
         }