Commit ea4a18d3 authored by gxx's avatar gxx

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

parents 428c6488 08a24c96
...@@ -15,4 +15,6 @@ interface FileServiceContract ...@@ -15,4 +15,6 @@ interface FileServiceContract
public function getAll($group_id); public function getAll($group_id);
public function get($id); public function get($id);
public function delete($file_id); public function delete($file_id);
public function groupSpace($group_id);
public function ossSpace($group_id);
} }
\ No newline at end of file
...@@ -30,12 +30,24 @@ class FileController extends Controller ...@@ -30,12 +30,24 @@ class FileController extends Controller
} }
} }
public function deleteFormOss(Request $request)
public function groupSpace(Request $request)
{ {
$file_id = $request; $group_id = $request->group_id;
$result = $this->mFile->delete($file_id); $result = $this->mFile->groupSpace($group_id);
if($result){ $mbyte = $result/1048576;
return view(route('500')); $finalspace = array("usespace"=>$mbyte);
$finalspace = json_encode($finalspace);
return $finalspace;
} }
public function ossSpace(Request $request)
{
$group_id = $request->group_id;
$result = $this->mFile->groupSpace($group_id);
$mbyte = $result/1048576;
$finalspace = array("usespace"=>$mbyte);
$finalspace = json_encode($finalspace);
return $finalspace;
} }
} }
...@@ -59,4 +59,28 @@ class FileService implements FileServiceContract ...@@ -59,4 +59,28 @@ class FileService implements FileServiceContract
// } // }
// return $result; // return $result;
} }
public function groupSpace($group_id)
{
$files = File::where(["group"=>$group_id])->get();
$space = 0;
foreach ($files as $file)
{
$size = $file->size;
$space = $space+$size;
}
return $space;
}
public function ossSpace($group_id)
{
$files = File::where(["group"=>$group_id])->get()->unique("pointer");
$space = 0;
foreach ($files as $file)
{
$size = $file->size;
$space = $space+$size;
}
return $space;
}
} }
\ No newline at end of file
...@@ -115,6 +115,8 @@ Route::get('/',function (){return view('login');})->name('admin.login'); ...@@ -115,6 +115,8 @@ Route::get('/',function (){return view('login');})->name('admin.login');
Route::group(['prefix'=>'file'],function (){ Route::group(['prefix'=>'file'],function (){
Route::get('get_all','FileController@getAll')->name('file.getAll'); Route::get('get_all','FileController@getAll')->name('file.getAll');
Route::delete('delete_file','FileController@delete')->name('file.delete'); 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');
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment