Просмотр исходного кода

Implementación de controladores del workflow

JeanBenitez 1 год назад
Родитель
Сommit
fb24839733

+ 25 - 25
sistema-mantenimiento-back/app/Http/Controllers/EncryptionController.php

@@ -10,7 +10,7 @@ class EncryptionController extends Controller{
     private $public_key = "WrBEGoJnMnMhC/2hiaYypcmPwP9Z4p4/bNex0T/WUWA=";
     private $secret_key = "CEIBkv7QG1WoAoBO7Ny5cqzyJ5yCUwBMhnFYUBbCeTk=";
 
-    public function encrypt_old($msg){
+    private function encrypt_old($msg){
         $nonce = random_bytes(SODIUM_CRYPTO_BOX_NONCEBYTES);
         $nonceArr = array();
         for($i = 0; $i < strlen($nonce); $i++){
@@ -37,7 +37,7 @@ class EncryptionController extends Controller{
         return base64_encode($encryptedStr . "|" . $nonceStr);
     }
 
-    public function decrypt_old($enc){
+    private function decrypt_old($enc){
         $dec = base64_decode($enc);
         $decArr = explode("|", $dec);
 
@@ -96,29 +96,29 @@ class EncryptionController extends Controller{
     }
 
     public function decrypt($value) {
-      if(gettype($value) != 'string') return false;
-      
-      $value_string = base64_decode($value);
-      $value_array = explode('|', $value_string);
-
-      if(count($value_array) <  2) return false;
-
-      $encoded_string = base64_decode($value_array[0]);
-      $nonce_string = base64_decode($value_array[1]);
-
-      $encryption_key_dec = sodium_crypto_box_keypair_from_secretkey_and_publickey(
-          base64_decode($this->secret_key), 
-          base64_decode($this->public_key)
-      );
-
-      try{
-          $decrypted = sodium_crypto_box_open($encoded_string, $nonce_string, $encryption_key_dec);
-          return $decrypted;
-      }catch(ErrorException $e){
-          return false;
-      }catch(SodiumException $e){
-          return false;
-      }
+        if(gettype($value) != 'string') return false;
+        
+        $value_string = base64_decode($value);
+        $value_array = explode('|', $value_string);
+
+        if(count($value_array) <  2) return false;
+
+        $encoded_string = base64_decode($value_array[0]);
+        $nonce_string = base64_decode($value_array[1]);
+
+        $encryption_key_dec = sodium_crypto_box_keypair_from_secretkey_and_publickey(
+            base64_decode($this->secret_key), 
+            base64_decode($this->public_key)
+        );
+
+        try{
+            $decrypted = sodium_crypto_box_open($encoded_string, $nonce_string, $encryption_key_dec);
+            return $decrypted;
+        }catch(ErrorException $e){
+            return false;
+        }catch(SodiumException $e){
+            return false;
+        }
     }
 
     public function shortDec($enc){

Разница между файлами не показана из-за своего большого размера
+ 951 - 143
sistema-mantenimiento-back/app/Http/Controllers/ProcessManagementController.php


+ 1 - 1
sistema-mantenimiento-back/app/Http/Controllers/ProviderController.php

@@ -291,7 +291,7 @@ class ProviderController extends Controller{
 
     public function updateProvider(Request $request) {
         $validator = Validator::make($request->all(), [
-            'line' => 'required|string',
+            'line' => 'required|integer',
             'user' => 'required|string',
             'obj_response' => 'required',
         ]);

+ 5 - 2
sistema-mantenimiento-back/app/Http/Controllers/RequestLineController.php

@@ -35,7 +35,7 @@ class RequestLineController extends Controller
     // Se registran las líneas de solicitud
     public function createRequestLine(Request $request){
         $validator = Validator::make($request->all(), [
-            'LINE' => 'required|string',
+            'LINE' => 'required|integer',
             'USER' => 'required|string',
             'PRODUCTS' => 'required|array',
             'PURPOSE' => 'required',
@@ -236,11 +236,14 @@ class RequestLineController extends Controller
         $encInfoRegistro = $this->encController->encrypt($strInfoRegistro);
 
         $arrResponseRequestWorkflow = $this->processManagementController->registerRequestWorkflow(1, $encToWorkflow, $encInfoRegistro, $user, $requestData['LINE']);
+        // DB::rollBack();
+        // return $arrResponseRequestWorkflow;
         if ($arrResponseRequestWorkflow['error']) {
             DB::rollBack();
             return $this->responseController->makeResponse(true, $arrResponseRequestWorkflow['msg'], $arrResponseRequestWorkflow['response'], 500);
         }
-       
+        
+        // DB::rollBack(); 
         DB::commit();
         return $this->responseController->makeResponse(false, "ÉXITO: Registro correcto");
     }

+ 32 - 0
sistema-mantenimiento-back/app/Http/Controllers/ResourcesController.php

@@ -610,4 +610,36 @@ class ResourcesController extends Controller
         return $arrResponse;
     }
 
+    public function getUser($idUser, $line) {
+        $arrResponse = array('error' => false, 'msg' => '', 'response' => []);
+        
+        try {
+            $user = (array) DB::table('S002V01TUSUA')
+                ->where('USUA_IDUS', '=', $idUser)
+                ->where('USUA_NULI', '=', $line)
+                ->first([
+                    'USUA_NOMB AS NOMBRE',
+                    'USUA_APPA AS APELLIDO_PATERNO',
+                    'USUA_APMA AS APELLIDO_MATERNO',
+                ]);
+        } catch (\Throwable $th) {
+            $arrResponse['error'] = true;
+            $arrResponse['msg'] = 'Ocurrió un error al obtener el nombre del usuario.';
+            return $arrResponse;
+        }
+        
+        if (empty($user)) {
+            $arrResponse['error'] = true;
+            $arrResponse['msg'] = 'El usuario no existe.';
+            return $arrResponse;
+        }
+
+        $nameUser = $user['NOMBRE'] . ' ' . $user['APELLIDO_PATERNO'];
+        if (array_key_exists('APELLIDO_MATERNO', $user)) {
+            $nameUser .= ' ' . $user['APELLIDO_MATERNO'];
+        }
+        $arrResponse['response'] = $nameUser;
+        return $arrResponse;
+    }
+
 }

+ 16 - 14
sistema-mantenimiento-back/routes/api.php

@@ -529,20 +529,22 @@ Route::middleware(['jwt.auth'])->group(function(){
     Route::post('process-management/register-workflows',                            [ProcessManagementController::class, 'registerWorkflow']);
     Route::put ('process-management/update-workflows/{idWorkflow}',                 [ProcessManagementController::class, 'updateWorkflow']);
     Route::put ('process-management/delete-workflows/{idWorkflow}',                 [ProcessManagementController::class, 'deleteWorkflow']);
-    
-    Route::get ('process-management/get-process-workflow/{user}/{line}',    [ProcessManagementController::class, 'getProcessWorkflow']);
-    
-    Route::get ('process-management/get-tasks/{user}/{line}',               [ProcessManagementController::class, 'getTasks']);
-    Route::get ('process-management/get-task-by-id/{idTask}/{user}/{line}', [ProcessManagementController::class, 'getTaskById']);
-    Route::post('process-management/register-task',                         [ProcessManagementController::class, 'registerTask']);
-    Route::put ('process-management/update-task/{idTask}',                  [ProcessManagementController::class, 'updateTask']);
-    Route::put ('process-management/delete-task/{idTask}',                  [ProcessManagementController::class, 'deleteTask']);
-
-    Route::get ('process-management/get-execute-workflow/{user}/{line}',            [ProcessManagementController::class, 'getExecuteWorkflow']);
-    Route::get ('process-management/get-execute-task/{idExecute}/{user}/{line}',    [ProcessManagementController::class, 'getExecuteTask']);
-    Route::put ('process-management/update-request-workflow/{idExecute}',           [ProcessManagementController::class, 'updateRequestWorkflow']);
-
-    
+    Route::get ('process-management/get-process-workflow/{user}/{line}',                [ProcessManagementController::class, 'getProcessWorkflow']);
+    Route::get ('process-management/get-tasks/{user}/{line}',                           [ProcessManagementController::class, 'getTasks']);
+    Route::get ('process-management/get-task-by-workflow/{idWorkflow}/{user}/{line}',   [ProcessManagementController::class, 'getTaskByWorkflow']);
+    Route::get ('process-management/get-task-by-id/{idTask}/{user}/{line}',             [ProcessManagementController::class, 'getTaskById']);
+    Route::post('process-management/register-task',                                     [ProcessManagementController::class, 'registerTask']);
+    Route::put ('process-management/update-task/{idTask}',                              [ProcessManagementController::class, 'updateTask']);
+    Route::put ('process-management/delete-task/{idTask}',                              [ProcessManagementController::class, 'deleteTask']);
+    Route::get ('process-management/get-execute-workflow/{user}/{line}',                        [ProcessManagementController::class, 'getExecuteWorkflow']);
+    Route::get ('process-management/get-execute-task/{idExecute}/{user}/{line}',                [ProcessManagementController::class, 'getExecuteTask']);
+    Route::get ('process-management/get-history-notificate-task/{idExecuteTask}/{user}/{line}', [ProcessManagementController::class, 'getHistoryNotificateTask']);
+    Route::put ('process-management/update-request-workflow/{idExecuteTask}',                   [ProcessManagementController::class, 'updateRequestWorkflow']);
+    Route::post('process-management/search-request-workflow',                                   [ProcessManagementController::class, 'searchRequestWorkflow']);
+    Route::get ('process-management/get-details-execute-request/{idExecuteTask}/{user}/{line}', [ProcessManagementController::class, 'getDetailsExecuteRequest']);
+    Route::post('process-management/search-notificate',                                     [ProcessManagementController::class, 'searchNotificate']);
+    Route::get ('process-management/get-details-notificate/{idNotificate}/{user}/{line}',   [ProcessManagementController::class, 'getDetailsNotificate']);
+    Route::post('process-management/activate-workflow-automatic',   [ProcessManagementController::class, 'activateManualWorkflow']);
 
     // Localidad
     Route::get ('catalog/get-payment-method-active/{line_number}',            [CatalogController::class, 'getPaymentMethodActive']);

Некоторые файлы не были показаны из-за большого количества измененных файлов