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

app/Contracts/FileServiceContract.php

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

app/Http/Controllers/FileController.php

@@ -42,7 +42,7 @@ class FileController extends Controller
         return $finalspace;
     }
 
-    public function ossSpace(Request $request)
+    public function ossSpace()
     {
 
         $result = $this->mFile->ossSpace();
@@ -52,6 +52,16 @@ class FileController extends Controller
         return $finalspace;
     }
 
+    public function groupOssSpace(Request $request)
+    {
+        $group_id = $request->group_id;
+        $result = $this->mFile->groupOssSpace($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

@@ -87,6 +87,18 @@ class FileService implements FileServiceContract
         return $space;
     }
 
+    public function groupOssSpace($group_id)
+    {
+        $files = File::where(["group_id"=>$group_id])->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();

routes/web.php

@@ -117,6 +117,7 @@ Route::get('/',function (){return view('login');})->name('admin.login');
         Route::delete('delete_file','FileController@delete')->name('file.delete');
         Route::get('group_space','FileController@groupSpace')->name('file.groupSpace');
         Route::get('oss_space','FileController@ossSpace')->name('file.ossSpace');
+        Route::get('group_oss_space','FileController@groupOssSpace')->name('file.groupOssSpace');
         Route::get('count_file','FileController@countFile')->name('file.countFile');
         Route::get('oss_statistics','FileController@ossStatistics')->name('file.ossStatistics');
     });