- Add supervision ArcadiaLink
This commit is contained in:
parent
b69878a543
commit
bccc241457
13 changed files with 143 additions and 40 deletions
|
|
@ -57,6 +57,11 @@ class ArcadiaLink extends Command
|
|||
$media->isLocked = 0;
|
||||
$media->save();
|
||||
|
||||
// Suppression dans la supervision Arcadia Link
|
||||
$a = \App\Models\ArcadiaLink::where('media_id', $fileContent->code_DAM)->first();
|
||||
if ($a)
|
||||
$a->delete();
|
||||
|
||||
// ---- Index dans Elasticsearch
|
||||
$media = Media::withTrashed()->find($media->id);
|
||||
$esExist = Media::searchByQuery(array('match' => array('arcadia_id' => "$media->arcadia_id")));
|
||||
|
|
|
|||
27
app/Http/Controllers/ArcadiaLinkController.php
Normal file
27
app/Http/Controllers/ArcadiaLinkController.php
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\ArcadiaLink;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class ArcadiaLinkController extends Controller
|
||||
{
|
||||
public function index(Request $request)
|
||||
{
|
||||
Auth::user()->authorizeRoles(config('roles.const.ADMIN'));
|
||||
$dt = Carbon::now('Europe/Paris')->subMinutes(15)->toDateTimeString();
|
||||
$ano = ArcadiaLink::where('created_at', '<', $dt)->orderBy('id', 'DESC')->get();
|
||||
return view('arcadialink.index', ['ano' => $ano]);
|
||||
}
|
||||
|
||||
public function delete(Request $request)
|
||||
{
|
||||
$id = $request->id;
|
||||
$a = ArcadiaLink::find($id);
|
||||
$a->delete();
|
||||
return redirect()->route('arcadialink.index');
|
||||
}
|
||||
}
|
||||
|
|
@ -34,17 +34,6 @@ trait ArcadiaLink {
|
|||
$media->isLocked = 1;
|
||||
$media->save();
|
||||
self::convert(self::getXML($media, "S"), $media);
|
||||
|
||||
/*$dom = new DOMDocument('1.0','UTF-8');
|
||||
$dom->formatOutput = true;
|
||||
$root = $dom->createElement('MEDIA_VISUEL');
|
||||
$dom->appendChild($root);
|
||||
$root->appendChild($dom->createElement('codeArcadia'))->appendChild($dom->createCDATASection( "$media->arcadia_id"));
|
||||
$root->appendChild($dom->createElement('code_DAM'))->appendChild($dom->createCDATASection( "$media->id"));
|
||||
$root->appendChild( $dom->createElement('TypeMouvement'))->appendChild($dom->createCDATASection( "S"));
|
||||
$xml = $dom->saveXML();
|
||||
|
||||
self::convert($xml, $media);*/
|
||||
}
|
||||
|
||||
public static function reactivate($media)
|
||||
|
|
@ -55,53 +44,36 @@ trait ArcadiaLink {
|
|||
$media->isLocked = 1;
|
||||
$media->save();
|
||||
self::convert(self::getXML($media, "R"), $media);
|
||||
|
||||
/*$dom = new DOMDocument('1.0','UTF-8');
|
||||
$dom->formatOutput = true;
|
||||
$root = $dom->createElement('MEDIA_VISUEL');
|
||||
$dom->appendChild($root);
|
||||
$root->appendChild($dom->createElement('codeArcadia'))->appendChild($dom->createCDATASection( "$media->arcadia_id"));
|
||||
$root->appendChild($dom->createElement('code_DAM'))->appendChild($dom->createCDATASection( "$media->id"));
|
||||
$root->appendChild( $dom->createElement('TypeMouvement'))->appendChild($dom->createCDATASection( "R"));
|
||||
$xml = $dom->saveXML();
|
||||
|
||||
self::convert($xml, $media);*/
|
||||
}
|
||||
|
||||
private static function convert($xml, $media)
|
||||
{
|
||||
$uid = sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x', mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0x0fff) | 0x4000, mt_rand(0, 0x3fff) | 0x8000, mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
|
||||
Storage::disk('arcadia_link_s')->put("$uid.xml", $xml);
|
||||
self::compress($media->folder, $media->uid, $media->extension, $uid, $media->id);
|
||||
self::compress($uid, $media);
|
||||
}
|
||||
|
||||
private static function compress($folder, $name, $extension, $uid, $media_id)
|
||||
private static function compress($uid, $media)
|
||||
{
|
||||
try {
|
||||
$zip_file = storage_path('arcadia_link/send') ."/$media_id-$uid.zip";
|
||||
$zip_file = storage_path('arcadia_link/send') ."/$media->id-$uid.zip";
|
||||
$zip = new \ZipArchive();
|
||||
$zip->open($zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
|
||||
$zip->addFile(storage_path('arcadia_link/send') . "/$uid.xml", 'media.xml');
|
||||
$zip->addFile(public_path() . "/$folder$name.$extension", "$name.$extension");
|
||||
$zip->addFile(public_path() . "/$media->folder$media->uid.$media->extension", "$media->uid.$media->extension");
|
||||
$zip->close();
|
||||
unset($zip);
|
||||
unlink(storage_path('arcadia_link/send') . "/$uid.xml");
|
||||
|
||||
/* Pour faire la meme chose en .tar (CDC Initial)
|
||||
$a = new \PharData( storage_path('arcadia_link/send') ."/$uid.tmp");
|
||||
// On insert dans la table de supervision
|
||||
$s = new \App\Models\ArcadiaLink();
|
||||
$s->media_id = $media->id;
|
||||
if ($media->arcadia_id !== NULL) {
|
||||
$s->arcadia_id = $media->arcadia_id;
|
||||
}
|
||||
$s->filename = "$media->id-$uid.zip";
|
||||
$s->save();
|
||||
|
||||
// ADD FILES TO archive.tar FILE
|
||||
$a->addFile(storage_path('arcadia_link/send') . "/$uid.xml", 'media.xml');
|
||||
$a->addFile(public_path() . "/$folder$name.$extension", "$name.$extension");
|
||||
|
||||
// COMPRESS archive.tar FILE. COMPRESSED FILE WILL BE archive.tar.gz
|
||||
$a->compress(\Phar::NONE);
|
||||
|
||||
// NOTE THAT BOTH FILES WILL EXISTS. SO IF YOU WANT YOU CAN UNLINK archive.tar
|
||||
unset($a);
|
||||
unlink(storage_path('arcadia_link/send') . "/$uid.tmp");
|
||||
unlink(storage_path('arcadia_link/send') . "/$uid.xml");
|
||||
*/
|
||||
} catch (Exception $e) {
|
||||
//echo "Exception : " . $e;
|
||||
// TODO : Envoi mail Log
|
||||
|
|
|
|||
21
app/Models/ArcadiaLink.php
Normal file
21
app/Models/ArcadiaLink.php
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Carbon\Carbon;
|
||||
|
||||
class ArcadiaLink extends Model
|
||||
{
|
||||
protected $table = 'arcadia_link';
|
||||
|
||||
public function getDateFAttribute() {
|
||||
return Carbon::createFromFormat('Y-m-d H:i:s', $this->created_at)->format('d/m/Y H:i:s');
|
||||
}
|
||||
|
||||
public function getMediaUuidAttribute() {
|
||||
$m = Media::find($this->media_id);
|
||||
return $m->uid;
|
||||
}
|
||||
|
||||
}
|
||||
69
resources/views/arcadialink/index.blade.php
Normal file
69
resources/views/arcadialink/index.blade.php
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
@extends('layouts.app')
|
||||
@include('layouts.header')
|
||||
@section('content')
|
||||
<main class="user_index template_2col">
|
||||
<div class="side_menu">
|
||||
<a href="{{ route('user.index') }}"><span>Gestion des utilisateurs</span><i
|
||||
class="fas fa-users-cog"></i></a>
|
||||
<a href="{{ route('dossier.index') }}"><span>Gestion des dossiers</span><i class="fas fa-folders"></i></a>
|
||||
<a href="{{ route('recovery.index') }}"><span>Récupération des médias</span><i
|
||||
class="fas fa-undo-alt"></i></a>
|
||||
<a class="active" href="{{ route('arcadialink.index') }}"><span>Anomalies du lien Arcadia</span><i class="fas fa-bug"></i></a>
|
||||
</div>
|
||||
<div class="main_content">
|
||||
@if ($errors->any())
|
||||
<div class="alert alert-danger">
|
||||
<i class="fas fa-times"></i>
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ __($error) }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
@if (session()->has('error'))
|
||||
<div class="alert alert-danger">
|
||||
<i class="fas fa-times"></i>
|
||||
<ul>
|
||||
<li>{{ Session::get('error') }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
@if (session()->has('message'))
|
||||
<div class="alert alert-ok">
|
||||
<i class="fas fa-check"></i>
|
||||
<ul>
|
||||
<li>{{ Session::get('message') }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
<div class="heading">
|
||||
<h1>Anomalies du lien Arcadia</h1>
|
||||
</div>
|
||||
<table class="datatable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>Media ID (DAM ID)</th>
|
||||
<th>Arcadia ID</th>
|
||||
<th>Filename</th>
|
||||
<th>Date création ZIP</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
@foreach ($ano as $line)
|
||||
<tr class="data_row">
|
||||
<td>{{$line->id}}</td>
|
||||
<td>{{$line->media_id}}</td>
|
||||
<td>{{$line->arcadia_id}}</td>
|
||||
<td>{{$line->filename}}</td>
|
||||
<td>{{$line->date_f}}</td>
|
||||
<td><a href="/media/{{$line->media_uuid}}" target="_blank">Ouvrir la fiche média</a></td>
|
||||
<td><a href="{{route('arcadialink.delete', ['id' => $line->id])}}" onclick="return confirm('Êtes-vous sûr de vouloir supprimer cette anomalie ?');"><i class="fas fa-times" style="color: red"></i></a></td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</table>
|
||||
</div>
|
||||
</main>
|
||||
@endsection
|
||||
|
|
@ -6,6 +6,7 @@
|
|||
<a href="{{ route('user.index') }}"><span>Gestion des utilisateurs</span><i class="fas fa-users-cog"></i></a>
|
||||
<a class="active" href="{{ route('dossier.index') }}"><span>Gestion des dossiers</span><i class="fas fa-folders"></i></a>
|
||||
<a href="{{ route('recovery.index') }}"><span>Récupération des médias</span><i class="fas fa-undo-alt"></i></a>
|
||||
<a href="{{ route('arcadialink.index') }}"><span>Anomalies du lien Arcadia</span><i class="fas fa-bug"></i></a>
|
||||
</div>
|
||||
<div class="main_content">
|
||||
@if ($errors->any())
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
<a href="{{ route('user.index') }}"><span>Gestion des utilisateurs</span><i class="fas fa-users-cog"></i></a>
|
||||
<a class="active" href="{{ route('dossier.index') }}"><span>Gestion des dossiers</span><i class="fas fa-folders"></i></a>
|
||||
<a href="{{ route('recovery.index') }}"><span>Récupération des médias</span><i class="fas fa-undo-alt"></i></a>
|
||||
<a href="{{ route('arcadialink.index') }}"><span>Anomalies du lien Arcadia</span><i class="fas fa-bug"></i></a>
|
||||
</div>
|
||||
<div class="main_content">
|
||||
@if ($errors->any())
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
<a href="{{ route('user.index') }}"><span>Gestion des utilisateurs</span><i class="fas fa-users-cog"></i></a>
|
||||
<a class="active" href="{{ route('dossier.index') }}"><span>Gestion des dossiers</span><i class="fas fa-folders"></i></a>
|
||||
<a href="{{ route('recovery.index') }}"><span>Récupération des médias</span><i class="fas fa-undo-alt"></i></a>
|
||||
<a href="{{ route('arcadialink.index') }}"><span>Anomalies du lien Arcadia</span><i class="fas fa-bug"></i></a>
|
||||
</div>
|
||||
<div class="main_content">
|
||||
<div class="heading">
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
<a href="{{ route('dossier.index') }}"><span>Gestion des dossiers</span><i class="fas fa-folders"></i></a>
|
||||
<a class="active" href="{{ route('recovery.index') }}"><span>Récupération des médias</span><i
|
||||
class="fas fa-undo-alt"></i></a>
|
||||
<a href="{{ route('arcadialink.index') }}"><span>Anomalies du lien Arcadia</span><i class="fas fa-bug"></i></a>
|
||||
</div>
|
||||
<div class="main_content">
|
||||
@if ($errors->any())
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
<a class="active" href="{{ route('user.index') }}"><span>Gestion des utilisateurs</span><i class="fas fa-users-cog"></i></a>
|
||||
<a href="{{ route('dossier.index') }}"><span>Gestion des dossiers</span><i class="fas fa-folders"></i></a>
|
||||
<a href="{{ route('recovery.index') }}"><span>Récupération des médias</span><i class="fas fa-undo-alt"></i></a>
|
||||
<a href="{{ route('arcadialink.index') }}"><span>Anomalies du lien Arcadia</span><i class="fas fa-bug"></i></a>
|
||||
</div>
|
||||
<div class="main_content">
|
||||
@if ($errors->any())
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
<a class="active" href="{{ route('user.index') }}"><span>Gestion des utilisateurs</span><i class="fas fa-users-cog"></i></a>
|
||||
<a href="{{ route('dossier.index') }}"><span>Gestion des dossiers</span><i class="fas fa-folders"></i></a>
|
||||
<a href="{{ route('recovery.index') }}"><span>Récupération des médias</span><i class="fas fa-undo-alt"></i></a>
|
||||
<a href="{{ route('arcadialink.index') }}"><span>Anomalies du lien Arcadia</span><i class="fas fa-bug"></i></a>
|
||||
</div>
|
||||
<div class="main_content">
|
||||
@if ($errors->any())
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
<a class="active" href="{{ route('user.index') }}"><span>Gestion des utilisateurs</span><i class="fas fa-users-cog"></i></a>
|
||||
<a href="{{ route('dossier.index') }}"><span>Gestion des dossiers</span><i class="fas fa-folders"></i></a>
|
||||
<a href="{{ route('recovery.index') }}"><span>Récupération des médias</span><i class="fas fa-undo-alt"></i></a>
|
||||
<a href="{{ route('arcadialink.index') }}"><span>Anomalies du lien Arcadia</span><i class="fas fa-bug"></i></a>
|
||||
</div>
|
||||
<div class="main_content">
|
||||
<div class="heading">
|
||||
|
|
|
|||
|
|
@ -64,6 +64,8 @@ Route::group(['middleware' => ['auth']], function(){
|
|||
Route::resource('dossier', 'DossierController');
|
||||
Route::get('/recovery', 'RecoveryController@index')->name('recovery.index');
|
||||
Route::post('/check-arcadia-id', 'RecoveryController@checkArcadiaId');
|
||||
Route::get('/arcadia-link', 'ArcadiaLinkController@index')->name('arcadialink.index');
|
||||
Route::get('/arcadia-link/{id}/delete', 'ArcadiaLinkController@delete')->name('arcadialink.delete');
|
||||
});
|
||||
|
||||
Auth::routes([
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue