userFileType

app/Contracts/FileServiceContract.php

@@ -20,5 +20,5 @@ interface FileServiceContract
     public function ossSpace();
     public function groupOssSpace($group_id);
     public function userOssSpace($user_id);
-    public function countFile($group_id);
+    public function countGroupFile($group_id);
 }
\ No newline at end of file

app/Http/Controllers/FileController.php

@@ -52,6 +52,8 @@ class FileController extends Controller
         return $finalspace;
     }
 
+
+
     public function ossSpace()
     {
 
@@ -76,16 +78,23 @@ class FileController extends Controller
     {
         $group_id = $request->user_id;
         $result = $this->mFile->userOssSpace($group_id);
-        $mbyte = $result/1048576;
-        $space = 10-$mbyte;
+        $mbyte = round($result/1048576);
+        $space = round(10-$mbyte);
         $finalspace = array(["value"=>$space,"name"=>"剩余空间"],["value"=>$mbyte,"name"=>"已用空间"]);
         return $finalspace;
     }
 
-    public function countFile(Request $request)
+    public function countGroupFile(Request $request)
     {
         $group_id = $request->group_id;
-        $result = $this->mFile->countFile($group_id);
+        $result = $this->mFile->countGroupFile($group_id);
+        return $result;
+    }
+
+    public function countUserFile(Request $request)
+    {
+        $user_id = $request->user_id;
+        $result = $this->mFile->countUserFile($user_id);
         return $result;
     }
 

app/Services/FileService.php

@@ -126,7 +126,7 @@ class FileService implements FileServiceContract
         return $space;
     }
 
-    public function countFile($group_id)
+    public function countGroupFile($group_id)
     {
         $files = File::where(["group_id"=>$group_id])->get();
         $count = $files->count();
@@ -146,4 +146,25 @@ class FileService implements FileServiceContract
         }
         return $result;
     }
+
+    public function countUserFile($user_id)
+    {
+        $files = File::where(["group_id"=>"0","creator_id"=>$user_id])->get();
+        $count = $files->count();
+        $files = $files->groupBy("file_type");
+        $files = $files->toArray();
+        $files_keys = array_keys($files);
+        $result = array();
+        $i = 0;
+        $a = null;
+        foreach($files as $type){
+            $files_keys[$a] = count($type);
+            $per = $files_keys[$a]/$count;
+            $per = floor($per*100);
+            $keyValue = array("value"=>$per,"name"=>$files_keys[$i]);
+            array_push($result,$keyValue);
+            $i+=1;
+        }
+        return $result;
+    }
 }
\ No newline at end of file