From e5a695f11bd72ae017aec6e0749b0e81a76dd619 Mon Sep 17 00:00:00 2001 From: xu Date: Wed, 6 Nov 2019 18:06:44 +0800 Subject: [PATCH] 1. F 授权接口返回码调整 2. F 序列号生成数量不能填小于等于0的数 --- app-api/controllers/AuthDeviceController.php | 20 +++++++------------- app-ht/modules/device/controllers/DeviceController.php | 10 +++++++--- app-ht/modules/device/views/device/createDevice.php | 4 ++++ console/controllers/TestController.php | 10 +++++----- domain/device/Device.php | 42 +++++++++++++++++++++++------------------- 5 files changed, 46 insertions(+), 40 deletions(-) diff --git a/app-api/controllers/AuthDeviceController.php b/app-api/controllers/AuthDeviceController.php index c7bf66d..8e02b04 100644 --- a/app-api/controllers/AuthDeviceController.php +++ b/app-api/controllers/AuthDeviceController.php @@ -52,8 +52,8 @@ class AuthDeviceController extends BaseController $getPostData = file_get_contents('php://input', 'r'); self::myLog('actionIndex postData:'.$getPostData); if (!$getPostData) { - $e->status = 2; - $e->message = '数据为空'; + $e->status = 1; + $e->message = '传入的数据为空'; return $e; } $getPostData = json_decode($getPostData, true); @@ -68,26 +68,20 @@ class AuthDeviceController extends BaseController $salt = self::SIGN_SALT; $makeSign = md5($manufactureNo . $projectNo. $modelNo . $productionNo . $timestamp . $deviceId. $salt); if ($sign != $makeSign) { - $e->status = 3; - $e->message = '签名有误'; + $e->status = 2; + $e->message = '签名出错'; return $e; } $authResult = Device::authDevice($deviceId, $manufactureNo, $projectNo, $modelNo, $productionNo); + $e->status = $authResult->status; + $e->message = $authResult->message; if ($authResult->success) { $e->mac = $authResult->mac; $e->serial_no = $authResult->serial_no; - $e->message = $authResult->message; - $e->status = 0; - } else { - $e->status = 4; - $e->message = $authResult->message; } - if ($authResult->status > 0) { - $e->status = $authResult->status; - } - + return $e; } } \ No newline at end of file diff --git a/app-ht/modules/device/controllers/DeviceController.php b/app-ht/modules/device/controllers/DeviceController.php index 738bfe0..d2f96b3 100644 --- a/app-ht/modules/device/controllers/DeviceController.php +++ b/app-ht/modules/device/controllers/DeviceController.php @@ -260,11 +260,15 @@ class DeviceController extends BaseController $e->success = false; $e->message = 'fail'; if (empty($num)) { - $e->message = '数量不能为0'; + $e->message = '数量不能为空'; return $this->renderJson($e); } - if (1 * $num > 30000) { - $e->message = '数量不能超过3万'; + if ($num *1 <= 0) { + $e->message = '数量不能小于等于0'; + return $this->renderJson($e); + } + if (1 * $num > 10000) { + $e->message = '数量不能超过1万'; return $this->renderJson($e); } diff --git a/app-ht/modules/device/views/device/createDevice.php b/app-ht/modules/device/views/device/createDevice.php index 61befda..9b5350a 100644 --- a/app-ht/modules/device/views/device/createDevice.php +++ b/app-ht/modules/device/views/device/createDevice.php @@ -263,6 +263,10 @@ $(function() { alert('请录入数量'); return false; } + if (append_num *1 <=0) { + alert('请录入大于0的数量'); + return false; + } if (append_num*1 > 3000) { alert('追加数量不要超过3000'); return false; diff --git a/console/controllers/TestController.php b/console/controllers/TestController.php index c553753..2541c71 100644 --- a/console/controllers/TestController.php +++ b/console/controllers/TestController.php @@ -34,13 +34,13 @@ class TestController extends Controller public function actionDeviceAuth() { - $url = 'http://kingb:8012/app-api/web/authDevice'; - //$url = 'http://47.107.95.101/app-api/web/authDevice'; + //$url = 'http://kingb:8012/app-api/web/authDevice'; + $url = 'http://47.107.95.101/app-api/web/authDevice'; $manufactureNo = '0003'; - $device_id = 'HZ5DEVICE00007'; + $device_id = '000000010108'; $projectNo = '0003'; - $modelNo = '0003'; - $productionNo = '0003'; + $modelNo = '0002'; + $productionNo = '0004'; $timestamp = time(); $salt = 13456; $sign = md5($manufactureNo. $projectNo. $modelNo . $productionNo . $timestamp .$device_id. $salt); diff --git a/domain/device/Device.php b/domain/device/Device.php index 186c0ef..c169471 100644 --- a/domain/device/Device.php +++ b/domain/device/Device.php @@ -119,6 +119,7 @@ class Device $batchModel = CreateBatchRepository::findOne(['batch_no' => $batchNo]); if (empty($batchModel)) { $e->message = '没有该批次'; + $e->status = 3; $item = [ 'manufacture_no' => $manufactureNo, 'project_no' => $projectNo, @@ -136,20 +137,23 @@ class Device if (DeviceStatus::HAS_AUTH == $deviceModel->status) { $e->mac = $deviceModel->mac; $e->serial_no = $deviceModel->serial_no; - $e->message = '授权成功'; + $e->message = '授权成功, 重复授权'; $e->success = true; - $e->status = 5; - } elseif(DeviceStatus::NO_AUTH == $deviceModel->status) { + $e->status = 4; + } else{ $deviceModel->status = DeviceStatus::HAS_AUTH; $deviceModel->auth_at = time(); - $deviceModel->save(); - $e->mac = $deviceModel->mac; - $e->serial_no = $deviceModel->serial_no; - $e->message = '授权成功'; - $e->success = true; - $e->status = 5; - } else { - $e->message = '授权失败'; + if ($deviceModel->save()){ + $e->mac = $deviceModel->mac; + $e->serial_no = $deviceModel->serial_no; + $e->message = '授权成功, 重复授权'; + $e->success = true; + $e->status = 4; + } else { + $e->message = '设备已经存在，授权失败'; + $e->success = false; + $e->status = 5; + } } return $e; @@ -169,8 +173,8 @@ class Device ]; DeviceAuthFail::create($item); } - - $e->message = '授权失败'; + $e->status = 6; + $e->message = '授权失败,超过厂商设定的批次数量'; return $e; } @@ -184,15 +188,17 @@ class Device $e->serial_no = $genDeviceModel->serial_no; $e->mac = $genDeviceModel->mac; } else { + $e->status = 7; $e->message = '授权失败, 下次重试授权！'; - $e->success = false; + } return $e; } // 找到未空白未绑定的设备序列号 $newDeviceModel = DeviceRepository::findOne(['device_id' => null,'batch_id' => $batchId, 'is_delete' => 0, 'status' => DeviceStatus::NO_AUTH]); if (empty($newDeviceModel)) { - $e->message = '授权失败，系统参数有误'; + $e->status = 8; + $e->message = '授权失败，系统异常'; return $e; } $newDeviceModel->device_id = $deviceId; @@ -205,12 +211,10 @@ class Device $e->serial_no = $newDeviceModel->serial_no; $e->mac = $newDeviceModel->mac; } else { - $e->message = '授权失败'; - $e->status = 9; //系统异常 - $e->success = true; + $e->message = '授权失败,系统异常'; + $e->status = 8; //系统异常 } - return $e; } -- libgit2 0.21.0