Изменен requestId на милисекунды - 13 знаков

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index d8c49c1c7543218d88cdc5047e43cdd01092e076..6d5df1a5300cb877ea983d89c1e59f5f593323dd 100644 (file)
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -8,6 +8,8 @@ use Yii;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Json;
 use yii_app\helpers\ClientHelper;
+use yii_app\helpers\DataHelper;
+use yii_app\helpers\DateHelper;
 use yii_app\helpers\SalaryHelper;
 use yii_app\records\Admin;
 use yii_app\records\AdminGroup;
@@ -105,11 +107,11 @@ class DataController extends BaseController
         }
 
         $result['ver'] = $result['ver'] ?? '';
-
+        $requestId =  DataHelper::getRequestId();
 //        file_put_contents(self::OUT_DIR . '/a1_request_in.json', PHP_EOL . date('Y-m-d H:i:s') . ' ' . $result["ver"], FILE_APPEND | LOCK_EX);
 
         if (empty($result['ver']) || round($result['ver'], 2) < 1.1) {
-            file_put_contents(self::OUT_DIR . '/request_exit_' . time() . '.json', PHP_EOL . $result["ver"], FILE_APPEND | LOCK_EX);
+            file_put_contents(self::OUT_DIR . '/request_exit_' . $requestId . '.json', PHP_EOL . $result["ver"], FILE_APPEND | LOCK_EX);
 
             return $this->asJson(["error_id" => 1, "error" => "minimal version is 1.1"]);
         }
@@ -121,7 +123,7 @@ class DataController extends BaseController
 //            $mess["balances"] = false;
 //            $mess["prices"] = false;
 //            $mess["counteragents"] = false;
-            $mess["request_id"] = "" . time();
+            $mess["request_id"] = $requestId;
             $mess["checks"] = ["start_time" => date("Y-m-d H:i:s", time() - 2 * 3600), "end_time" => date("Y-m-d H:i:s")];
 //            $mess["payment_types"] = false;
             $mess['line'][] = __LINE__;
@@ -246,7 +248,7 @@ class DataController extends BaseController
                         [
                             'status'     => 1,
                             'date_up'    => date('Y-m-d H:i:s'),
-                            'request_id' => $mess['request_id'] ?? (string) time(),
+                            'request_id' => $mess['request_id'] ?? $requestId,
                         ],
                         [
                             'and',
@@ -261,7 +263,7 @@ class DataController extends BaseController
                         if (!empty($cronDecoded['request_id'])) {
                             $jsonId = $cronDecoded['request_id'];
                         } else {
-                            $jsonId = $apiCron->request_id ?: ($mess['request_id'] ?? (string) time());
+                            $jsonId = $apiCron->request_id ?: ($mess['request_id'] ?? $requestId);
                         }
 
                         $payload = $this->mergePayloads($payload, $cronDecoded);
@@ -287,7 +289,7 @@ class DataController extends BaseController
                 }
 
                 if (empty($jsonId)) {
-                    $jsonId = $mess['request_id'] ?? (string) time();
+                    $jsonId = $mess['request_id'] ?? $requestId;
                 }
 
                 $json = json_encode($payload, JSON_UNESCAPED_UNICODE);
@@ -995,7 +997,7 @@ class DataController extends BaseController
             $requestIdText = $result["request_id"];
             $fl = "request_id_" . $result["request_id"];
         } else {
-            $fl = time();
+            $fl = DataHelper::getRequestId();
         }
         //InfoLogService::setInfoLog(__FILE__, __LINE__, 'upload_' . $fl . '.json' , 'info_id_25_1');
 
@@ -2500,7 +2502,7 @@ class DataController extends BaseController
             }
 
 //
-            $mess["request_id"] = "" . time();
+            $mess["request_id"] = $requestId;
 
             if (!empty($result['created_orders'])) {
                 $mess['line'][] = __LINE__;
@@ -2795,9 +2797,6 @@ class DataController extends BaseController
                         }
                     }
                 }
-
-
-
             }
 
             $mess['line'][] = __LINE__;

diff --git a/erp24/helpers/DataHelper.php b/erp24/helpers/DataHelper.php
index e620cd657c1b2f01ffb6e42448e6e210b1758bf3..dd4c42b20462b07848fd477bcd7864d1e5d71966 100644 (file)
--- a/erp24/helpers/DataHelper.php
+++ b/erp24/helpers/DataHelper.php
@@ -123,4 +123,8 @@ class DataHelper
         return $number.' '.$titles[($number % 100 > 4 && $number % 100 < 20) ? 2 : $cases[min($number % 10, 5)]];
     }
 
+    public static function getRequestId() {
+        return DateHelper::getMicrosecondsString();
+    }
+
 }
\ No newline at end of file

diff --git a/erp24/helpers/DateHelper.php b/erp24/helpers/DateHelper.php
index 8451706e7f0df5202e528169135fe4e58a4e9ff4..9b05ed588ea0bf208fb5c1b46e8b8fb8783e9244 100644 (file)
--- a/erp24/helpers/DateHelper.php
+++ b/erp24/helpers/DateHelper.php
@@ -280,4 +280,9 @@ class DateHelper
         }
         return $intervals;
     }
+
+    public static function getMicrosecondsString(): string
+    {
+        return (string)((int)(microtime(true) * 1000));
+    }
 }
\ No newline at end of file