Merge branch 'dev-master' of 120.27.221.179:gxx123/workbiu-admin into dev-master

app/Contracts/FileServiceContract.php

@@ -16,7 +16,9 @@ interface FileServiceContract
     public function get($id);
     public function delete($file_id);
     public function groupSpace($group_id);
+    public function userSpace($user_id);
     public function ossSpace();
     public function groupOssSpace($group_id);
+    public function userOssSpace($user_id);
     public function countFile($group_id);
 }
\ No newline at end of file

app/Http/Controllers/FileController.php

@@ -42,6 +42,16 @@ class FileController extends Controller
         return $finalspace;
     }
 
+    public function userSpace(Request $request)
+    {
+        $user_id = $request->user_id;
+        $result = $this->mFile->userSpace($user_id);
+        $mbyte =ceil($result/1048576) ;
+        $space = 10-$mbyte;
+        $finalspace = array(['value'=>$mbyte,'name'=>'已用空间'],['value'=>$space,'name'=>'剩余空间']);
+        return $finalspace;
+    }
+
     public function ossSpace()
     {
 
@@ -62,6 +72,16 @@ class FileController extends Controller
         return $finalspace;
     }
 
+    public function userOssSpace(Request $request)
+    {
+        $group_id = $request->user_id;
+        $result = $this->mFile->userOssSpace($group_id);
+        $mbyte = $result/1048576;
+        $space = 10-$mbyte;
+        $finalspace = array(["value"=>$space,"name"=>"剩余空间"],["value"=>$mbyte,"name"=>"已用空间"]);
+        return $finalspace;
+    }
+
     public function countFile(Request $request)
     {
         $group_id = $request->group_id;

app/Services/FileService.php

@@ -75,6 +75,21 @@ class FileService implements FileServiceContract
         return $space;
     }
 
+    public function userSpace($user_id)
+    {
+        $files = File::where(["group_id"=>"0","creator_id"=>$user_id])->get();
+        if ($files->isEmpty()){
+            return null;
+        }
+        $space = 0;
+        foreach ($files as $file)
+        {
+            $size = $file->size;
+            $space = $space+$size;
+        }
+        return $space;
+    }
+
     public function ossSpace()
     {
         $files = File::all()->unique("pointer");
@@ -99,6 +114,18 @@ class FileService implements FileServiceContract
         return $space;
     }
 
+    public function userOssSpace($user_id)
+    {
+        $files = File::where(["creator_id"=>$user_id,"group_id"=>"0"])->get()->unique("pointer");
+        $space = 0;
+        foreach ($files as $file)
+        {
+            $size = $file->size;
+            $space = $space+$size;
+        }
+        return $space;
+    }
+
     public function countFile($group_id)
     {
         $files = File::where(["group_id"=>$group_id])->get();