OTHER_COMPANY_PROJECTS / ota

Download as
Browse Code »

Commit 51a896c1395ccce0e39aefb42332ab061777f526

Authored by xu
1 parent bb14629b
Exists in master

app-api 

1. F 接口升级加入barcode判断
Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
app-api/controllers/UpgradeController.php
  Diff comments   View file @51a896c
... ... @@ -236,7 +236,7 @@ class UpgradeController extends BaseController
236 236 $e->message = 'barcode格式有误';
237 237 return $e;
238 238 }
239   - $upgradeLogModel = UpgradeLogRepository::findOne(['device_id' => $deviceId, 'current_version' => $currentVersion, 'target_version' => $targetVersion, 'status' => $status, 'type' => UpgradeStatus::TYPE_OTA]);
  239 + $upgradeLogModel = UpgradeLogRepository::findOne(['device_id' => $deviceId, 'barcode'=> $barcode, 'current_version' => $currentVersion, 'target_version' => $targetVersion, 'status' => $status, 'type' => UpgradeStatus::TYPE_OTA]);
240 240 if ($upgradeLogModel) {
241 241 $upgradeLogModel->timestamp = $timestamp;
242 242 $upgradeLogModel->save();
... ... @@ -398,7 +398,7 @@ class UpgradeController extends BaseController
398 398 $e = new stdClass();
399 399 $e->status = 1;
400 400 $getPostData = file_get_contents('php://input', 'r');
401   - self::myLog('actionReportUpgradeEvent:'. $getPostData);
  401 + self::myLog('actionReportAPPUpgradeEvent:'. $getPostData);
402 402 if (!$getPostData) {
403 403 $e->message = '数据为空';
404 404 return $e;
... ... @@ -432,7 +432,7 @@ class UpgradeController extends BaseController
432 432 $e->message = 'barcode格式有误';
433 433 return $e;
434 434 }
435   - $upgradeLogModel = UpgradeLogRepository::findOne(['device_id' => $deviceId, 'package_name' => $packageName ,'current_version' => $currentVersion, 'target_version' => $targetVersion, 'status' => $status, 'type' => UpgradeStatus::TYPE_APP]);
  435 + $upgradeLogModel = UpgradeLogRepository::findOne(['device_id' => $deviceId, 'barcode'=> $barcode, 'package_name' => $packageName ,'current_version' => $currentVersion, 'target_version' => $targetVersion, 'status' => $status, 'type' => UpgradeStatus::TYPE_APP]);
436 436 if ($upgradeLogModel) {
437 437 $upgradeLogModel->timestamp = $timestamp;
438 438 $upgradeLogModel->save();
... ...