1. F 授权接口返回码调整

2. F 序列号生成数量不能填小于等于0的数

1. F 授权接口返回码调整
2. F 序列号生成数量不能填小于等于0的数
xu
1 parent d1ded260
Showing 5 changed files with 46 additions and 40 deletions Show diff stats
app-api/controllers/AuthDeviceController.php
app-ht/modules/device/controllers/DeviceController.php
app-ht/modules/device/views/device/createDevice.php
console/controllers/TestController.php
domain/device/Device.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
@@ -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);
         }
  
@@ -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;
@@ -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);
@@ -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;
         }
...	...	@@ -52,8 +52,8 @@ class AuthDeviceController extends BaseController
52	52	$getPostData = file_get_contents('php://input', 'r');
53	53	self::myLog('actionIndex postData:'.$getPostData);
54	54	if (!$getPostData) {
55		- $e->status = 2;
56		- $e->message = '数据为空';
	55	+ $e->status = 1;
	56	+ $e->message = '传入的数据为空';
57	57	return $e;
58	58	}
59	59	$getPostData = json_decode($getPostData, true);
...	...	@@ -68,26 +68,20 @@ class AuthDeviceController extends BaseController
68	68	$salt = self::SIGN_SALT;
69	69	$makeSign = md5($manufactureNo . $projectNo. $modelNo . $productionNo . $timestamp . $deviceId. $salt);
70	70	if ($sign != $makeSign) {
71		- $e->status = 3;
72		- $e->message = '签名有误';
	71	+ $e->status = 2;
	72	+ $e->message = '签名出错';
73	73	return $e;
74	74	}
75	75
76	76	$authResult = Device::authDevice($deviceId, $manufactureNo, $projectNo, $modelNo, $productionNo);
77	77
	78	+ $e->status = $authResult->status;
	79	+ $e->message = $authResult->message;
78	80	if ($authResult->success) {
79	81	$e->mac = $authResult->mac;
80	82	$e->serial_no = $authResult->serial_no;
81		- $e->message = $authResult->message;
82		- $e->status = 0;
83		- } else {
84		- $e->status = 4;
85		- $e->message = $authResult->message;
86	83	}
87		- if ($authResult->status > 0) {
88		- $e->status = $authResult->status;
89		- }
90		-
	84	+
91	85	return $e;
92	86	}
93	87	}
94	88	\ No newline at end of file
...	...
...	...	@@ -260,11 +260,15 @@ class DeviceController extends BaseController
260	260	$e->success = false;
261	261	$e->message = 'fail';
262	262	if (empty($num)) {
263		- $e->message = '数量不能为0';
	263	+ $e->message = '数量不能为空';
264	264	return $this->renderJson($e);
265	265	}
266		- if (1 * $num > 30000) {
267		- $e->message = '数量不能超过3万';
	266	+ if ($num *1 <= 0) {
	267	+ $e->message = '数量不能小于等于0';
	268	+ return $this->renderJson($e);
	269	+ }
	270	+ if (1 * $num > 10000) {
	271	+ $e->message = '数量不能超过1万';
268	272	return $this->renderJson($e);
269	273	}
270	274
...	...
...	...	@@ -263,6 +263,10 @@ $(function() {
263	263	alert('请录入数量');
264	264	return false;
265	265	}
	266	+ if (append_num *1 <=0) {
	267	+ alert('请录入大于0的数量');
	268	+ return false;
	269	+ }
266	270	if (append_num*1 > 3000) {
267	271	alert('追加数量不要超过3000');
268	272	return false;
...	...
...	...	@@ -34,13 +34,13 @@ class TestController extends Controller
34	34
35	35	public function actionDeviceAuth()
36	36	{
37		- $url = 'http://kingb:8012/app-api/web/authDevice';
38		- //$url = 'http://47.107.95.101/app-api/web/authDevice';
	37	+ //$url = 'http://kingb:8012/app-api/web/authDevice';
	38	+ $url = 'http://47.107.95.101/app-api/web/authDevice';
39	39	$manufactureNo = '0003';
40		- $device_id = 'HZ5DEVICE00007';
	40	+ $device_id = '000000010108';
41	41	$projectNo = '0003';
42		- $modelNo = '0003';
43		- $productionNo = '0003';
	42	+ $modelNo = '0002';
	43	+ $productionNo = '0004';
44	44	$timestamp = time();
45	45	$salt = 13456;
46	46	$sign = md5($manufactureNo. $projectNo. $modelNo . $productionNo . $timestamp .$device_id. $salt);
...	...
...	...	@@ -119,6 +119,7 @@ class Device
119	119	$batchModel = CreateBatchRepository::findOne(['batch_no' => $batchNo]);
120	120	if (empty($batchModel)) {
121	121	$e->message = '没有该批次';
	122	+ $e->status = 3;
122	123	$item = [
123	124	'manufacture_no' => $manufactureNo,
124	125	'project_no' => $projectNo,
...	...	@@ -136,20 +137,23 @@ class Device
136	137	if (DeviceStatus::HAS_AUTH == $deviceModel->status) {
137	138	$e->mac = $deviceModel->mac;
138	139	$e->serial_no = $deviceModel->serial_no;
139		- $e->message = '授权成功';
	140	+ $e->message = '授权成功, 重复授权';
140	141	$e->success = true;
141		- $e->status = 5;
142		- } elseif(DeviceStatus::NO_AUTH == $deviceModel->status) {
	142	+ $e->status = 4;
	143	+ } else{
143	144	$deviceModel->status = DeviceStatus::HAS_AUTH;
144	145	$deviceModel->auth_at = time();
145		- $deviceModel->save();
146		- $e->mac = $deviceModel->mac;
147		- $e->serial_no = $deviceModel->serial_no;
148		- $e->message = '授权成功';
149		- $e->success = true;
150		- $e->status = 5;
151		- } else {
152		- $e->message = '授权失败';
	146	+ if ($deviceModel->save()){
	147	+ $e->mac = $deviceModel->mac;
	148	+ $e->serial_no = $deviceModel->serial_no;
	149	+ $e->message = '授权成功, 重复授权';
	150	+ $e->success = true;
	151	+ $e->status = 4;
	152	+ } else {
	153	+ $e->message = '设备已经存在，授权失败';
	154	+ $e->success = false;
	155	+ $e->status = 5;
	156	+ }
153	157	}
154	158
155	159	return $e;
...	...	@@ -169,8 +173,8 @@ class Device
169	173	];
170	174	DeviceAuthFail::create($item);
171	175	}
172		-
173		- $e->message = '授权失败';
	176	+ $e->status = 6;
	177	+ $e->message = '授权失败,超过厂商设定的批次数量';
174	178	return $e;
175	179	}
176	180
...	...	@@ -184,15 +188,17 @@ class Device
184	188	$e->serial_no = $genDeviceModel->serial_no;
185	189	$e->mac = $genDeviceModel->mac;
186	190	} else {
	191	+ $e->status = 7;
187	192	$e->message = '授权失败, 下次重试授权！';
188		- $e->success = false;
	193	+
189	194	}
190	195	return $e;
191	196	}
192	197	// 找到未空白未绑定的设备序列号
193	198	$newDeviceModel = DeviceRepository::findOne(['device_id' => null,'batch_id' => $batchId, 'is_delete' => 0, 'status' => DeviceStatus::NO_AUTH]);
194	199	if (empty($newDeviceModel)) {
195		- $e->message = '授权失败，系统参数有误';
	200	+ $e->status = 8;
	201	+ $e->message = '授权失败，系统异常';
196	202	return $e;
197	203	}
198	204	$newDeviceModel->device_id = $deviceId;
...	...	@@ -205,12 +211,10 @@ class Device
205	211	$e->serial_no = $newDeviceModel->serial_no;
206	212	$e->mac = $newDeviceModel->mac;
207	213	} else {
208		- $e->message = '授权失败';
209		- $e->status = 9; //系统异常
210		- $e->success = true;
	214	+ $e->message = '授权失败,系统异常';
	215	+ $e->status = 8; //系统异常
211	216	}
212	217
213		-
214	218	return $e;
215	219	}
216	220
...	...