From 12ea22a914b6083aa8a69b705ba0fd9445b7ef38 Mon Sep 17 00:00:00 2001 From: JoySystem_v Date: Wed, 21 Aug 2024 15:44:18 +0300 Subject: [PATCH] =?utf8?q?=D0=B2=D0=BE=D0=B7=D0=B2=D1=80=D0=B0=D1=82=D0=B8?= =?utf8?q?=D0=BB=20=D0=BF=D1=83=D1=82=D1=8C=20=D0=B8=20=D1=83=D1=81=D1=82?= =?utf8?q?=D0=B0=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20=D0=BC=D0=B5=D0=BD=D1=8C?= =?utf8?q?=D1=88=D0=B5=201000=20=D1=87=D0=B5=D0=BA=D0=BE=D0=B2=20=D0=BD?= =?utf8?q?=D0=B0=20811=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api2/controllers/DataController.php | 51 +++++++---------------- 1 file changed, 16 insertions(+), 35 deletions(-) diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php index 7cffb24b..9c7d6ba0 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -44,7 +44,7 @@ class DataController extends BaseController { const OUT_DIR = // __DIR__ . "/../json"; - "/www/api2/json"; + "/var/www/erp24/api2/json"; // "/var/www/www-root/data/www/api.bazacvetov24.ru/data/json"; public function actionRequest() { @@ -358,15 +358,13 @@ class DataController extends BaseController { return $this->asJson(['error' => ['code' => 400, 'message' => 'result empty']]); } - $requestId = ''; + $requestIdText = ''; if (!empty($result["request_id"])) { - $requestId = $result["request_id"]; + $requestIdText = $result["request_id"]; $fl = "request_id_" . $result["request_id"]; } else { $fl = time(); } - file_put_contents(self::OUT_DIR . '/error_upload.txt', - PHP_EOL . "requestId: " . $requestId, FILE_APPEND); //InfoLogService::setInfoLog(__FILE__, __LINE__, 'upload_' . $fl . '.json' , 'info_id_25_1'); file_put_contents(self::OUT_DIR . '/upload_' . $fl . '.json', PHP_EOL . $request); @@ -379,29 +377,25 @@ class DataController extends BaseController { } $mess["result"] = true; $checks_dell = ""; - $request_id = time(); - file_put_contents(self::OUT_DIR . '/error_upload.txt', - PHP_EOL . "request_id: " . $request_id, FILE_APPEND); + $requestId = time(); if (array_key_exists("request_id", $result) && !empty($result["request_id"])) { - $request_id = $result["request_id"]; + $requestId = $result["request_id"]; } $type_price = "Розничная цена"; - file_put_contents(self::OUT_DIR . '/error_upload.txt', - PHP_EOL . "request_id 2: " . $request_id, FILE_APPEND); - if (!empty($request_id)) { - $apiCron = ApiCron::find()->select(['json_post'])->where(['request_id' => $request_id])->one(); + + if (!empty($requestId)) { + $apiCron = ApiCron::find()->select(['json_post'])->where(['request_id' => $requestId])->one(); if ($apiCron) { $jsn = json_decode($apiCron->json_post, true, 512, JSON_UNESCAPED_UNICODE); $start_time = $jsn["checks"]["start_time"] ?? date('Y-m-d 00:00:00', time() - 3 * 86400); $end_time = $jsn["checks"]["end_time"] ?? date('Y-m-d 00:00:00', time()); $checks_dell = $jsn["checks_dell"] ?? ""; $type_price = $jsn["prices"]["type_price"] ?? "Розничная цена"; - file_put_contents(self::OUT_DIR . '/error_upload.txt', - PHP_EOL . "start_time: " . $start_time, FILE_APPEND); + ApiCron::updateAll(['status' => 1, 'date_up' => date('Y-m-d H:i:s')], - ['and', ['status' => 0], ['request_id' => $request_id]]); + ['and', ['status' => 0], ['request_id' => $requestId]]); - file_put_contents(self::OUT_DIR . '/request_api_cron.txt', PHP_EOL . date("d.m.Y H:i:s", time()) . "request_id=$request_id $start_time - $end_time ", FILE_APPEND); + file_put_contents(self::OUT_DIR . '/request_api_cron.txt', PHP_EOL . date("d.m.Y H:i:s", time()) . "request_id=$requestId $start_time - $end_time ", FILE_APPEND); } } @@ -641,10 +635,7 @@ class DataController extends BaseController { } } - file_put_contents(self::OUT_DIR . '/error_upload.txt', - PHP_EOL . $update , FILE_APPEND); - - if (!empty($result['write_offs'])) { + if (!empty($result['write_offs'])) { if (!empty($start_time) and !empty($end_time)) { if ($update) { WriteOffs::deleteAll(['and', ['>=', 'date', $start_time], ['<=', 'date', $end_time]]); @@ -809,19 +800,16 @@ class DataController extends BaseController { } // SalesUpdate::updateAll(['operation' => 'Удален'], ['and', ['>=', 'date', $start_time], ['<=', 'date', $end_time]]); - file_put_contents(self::OUT_DIR . '/check_dell.txt', PHP_EOL . date("d.m.Y H:i:s",time()). " regquest_id=$request_id Удаление $start_time - $end_time ", FILE_APPEND); + file_put_contents(self::OUT_DIR . '/check_dell.txt', PHP_EOL . date("d.m.Y H:i:s",time()). " regquest_id=$requestId Удаление $start_time - $end_time ", FILE_APPEND); } $matrixProductsIds = []; if (!empty($result['checks'])) { $matrixProductsIds = SalaryHelper::getMatrixProductsIds(); } - file_put_contents(self::OUT_DIR . '/error_upload.txt', - PHP_EOL . count($result['checks']) , FILE_APPEND); - if (!empty($result['checks']) && count($result['checks']) < 200) { - file_put_contents(self::OUT_DIR . '/error_upload.txt', - PHP_EOL . "if" , FILE_APPEND); + if (!empty($result['checks']) && count($result['checks']) < 1000) { + foreach ($result["checks"] as $arr) { $check_id = $arr["id"]; @@ -1263,7 +1251,7 @@ class DataController extends BaseController { } catch (Exception $e) { file_put_contents(self::OUT_DIR . '/log_error.txt', PHP_EOL . date("d.m.Y H:i:s",time()). $e->getMessage() . " " . $e->getLine(), FILE_APPEND); } finally { - LogService::apiDataLogs(1, json_encode($mess, JSON_UNESCAPED_UNICODE), $requestId); + LogService::apiDataLogs(1, json_encode($mess, JSON_UNESCAPED_UNICODE), $requestIdText); } return $this->asJson(['response' => true]); @@ -1609,13 +1597,6 @@ class DataController extends BaseController { $chunkValues = array_chunk($values, 1000); foreach ($chunkValues as $key => $rows) { - // Преобразование значений в $rows перед вставкой - // foreach ($rows as &$row) { - // if (isset($row['held'])) { - // Приведение значений к булевому типу - // $row['held'] = (bool)$row['held']; - // } - // } try { $transaction = \Yii::$app->db->beginTransaction(); -- 2.39.5