ossSpace

app/Contracts/FileServiceContract.php

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

app/Http/Controllers/FileController.php

@@ -44,12 +44,11 @@ class FileController extends Controller
 
     public function ossSpace(Request $request)
     {
-        $group_id = $request->group_id;
-        $result = $this->mFile->groupSpace($group_id);
-        $mbyte = $result/1048576;
-        $space = 10-$mbyte;
-        $finalspace = array("space"=>$space,"usespace"=>$mbyte);
-        $finalspace = json_encode($finalspace);
+
+        $result = $this->mFile->ossSpace();
+        $gbyte = $result/1073741824;
+        $space = 40-$gbyte;
+        $finalspace = array(["value"=>$space,"name"=>"剩余空间"],["value"=>$gbyte,"name"=>"已用空间"]);
         return $finalspace;
     }
 

app/Services/FileService.php

@@ -75,9 +75,9 @@ class FileService implements FileServiceContract
         return $space;
     }
 
-    public function ossSpace($group_id)
+    public function ossSpace()
     {
-        $files = File::where(["group_id"=>$group_id])->get()->unique("pointer");
+        $files = File::all()->unique("pointer");
         $space = 0;
         foreach ($files as $file)
         {