app-ht

1. U 调整代码格式 common 1. U 漏传代码

app-ht
1. U 调整代码格式 common 1. U 漏传代码
xu
1 parent ece5401b
Showing 2 changed files with 45 additions and 11 deletions Show diff stats
app-ht/modules/device/controllers/DeviceController.php
common/helpers/Utils.php
@@ -5,6 +5,7 @@ namespace app\ht\modules\device\controllers;
 use Yii;
 use yii\base\Exception;
 use yii\data\Pagination;
+use yii\helpers\Url;
 use app\ht\controllers\BaseController;
 use common\helpers\Utils;
 use common\helpers\FileUtil;
@@ -19,7 +20,26 @@ use domain\device\models\Device as DeviceModel;
 use domain\device\CreateBatch;
  
 use stdClass;
-use yii\helpers\Url;
+use function array_unique;
+use function count;
+use function explode;
+use function fclose;
+use function filesize;
+use function fopen;
+use function fgets;
+use function feof;
+use function fwrite;
+use function preg_match;
+use function str_split;
+use function strtotime;
+use function sprintf;
+use function strtolower;
+use function substr;
+use function strpos;
+use function strtoupper;
+use function hexdec;
+use function mb_substr;
+use function mt_rand;
  
 /**
  * 设备管理
@@ -1232,8 +1252,13 @@ class DeviceController extends BaseController
         fclose($fileHandle);
         $returnMac = [];
         foreach ($macList as $k => $v) {
-            if (preg_match('/^[0-9a-fA-F:]{12,18}$/', $v)) {
-                $returnMac[] = strtoupper(trim($v));
+	    $v = trim($v);
+            if (preg_match('/^[0-9a-fA-F:]{12,18}$/', $v)) {            
+                if (false !== strpos($v, ":")) {
+                    $returnMac[] = strtoupper($v);
+                } else {
+                    $returnMac[] = strtoupper(Utils::coverToMacAddress($v));
+                }
             }
         }
  
@@ -510,7 +510,7 @@ class Utils
     static function macGenerate()
     {
         $adrArray = [ "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F" ];
-        $returnMAC = [];
+        $returnMAC = '';
  
         for($i = 1; $i < 13 ; $i++) {
             $index = 0;
@@ -522,17 +522,26 @@ class Utils
                 $index = $indexArray[mt_rand(0, 7)];
             }
  
-            $returnMAC[] = $adrArray[$index];
+            $returnMAC = $returnMAC . $adrArray[$index];
         }
-        $returnStr = '';
-        foreach ($returnMAC as $k => $v) {
  
-            if (0 == ($k % 2) && 0 != $k) {
-                $returnStr = $returnStr.":";
-            }
-            $returnStr = $returnStr.$v;
+        return self::coverToMacAddress($returnMAC);
+    }
+
+    /**
+     * 把mac地址转化为带：的字符串
+     * @param $macStr
+     * @return string
+     */
+    static function coverToMacAddress($macStr)
+    {
+        if (empty($macStr)) {
+            return null;
         }
  
+        $macSplitArr = str_split($macStr, 2);
+        $returnStr = implode(":", $macSplitArr);
+
         return $returnStr;
     }
 }
 \ No newline at end of file
...	...	@@ -5,6 +5,7 @@ namespace app\ht\modules\device\controllers;
5	5	use Yii;
6	6	use yii\base\Exception;
7	7	use yii\data\Pagination;
	8	+use yii\helpers\Url;
8	9	use app\ht\controllers\BaseController;
9	10	use common\helpers\Utils;
10	11	use common\helpers\FileUtil;
...	...	@@ -19,7 +20,26 @@ use domain\device\models\Device as DeviceModel;
19	20	use domain\device\CreateBatch;
20	21
21	22	use stdClass;
22		-use yii\helpers\Url;
	23	+use function array_unique;
	24	+use function count;
	25	+use function explode;
	26	+use function fclose;
	27	+use function filesize;
	28	+use function fopen;
	29	+use function fgets;
	30	+use function feof;
	31	+use function fwrite;
	32	+use function preg_match;
	33	+use function str_split;
	34	+use function strtotime;
	35	+use function sprintf;
	36	+use function strtolower;
	37	+use function substr;
	38	+use function strpos;
	39	+use function strtoupper;
	40	+use function hexdec;
	41	+use function mb_substr;
	42	+use function mt_rand;
23	43
24	44	/**
25	45	* 设备管理
...	...	@@ -1232,8 +1252,13 @@ class DeviceController extends BaseController
1232	1252	fclose($fileHandle);
1233	1253	$returnMac = [];
1234	1254	foreach ($macList as $k => $v) {
1235		- if (preg_match('/^[0-9a-fA-F:]{12,18}$/', $v)) {
1236		- $returnMac[] = strtoupper(trim($v));
	1255	+ $v = trim($v);
	1256	+ if (preg_match('/^[0-9a-fA-F:]{12,18}$/', $v)) {
	1257	+ if (false !== strpos($v, ":")) {
	1258	+ $returnMac[] = strtoupper($v);
	1259	+ } else {
	1260	+ $returnMac[] = strtoupper(Utils::coverToMacAddress($v));
	1261	+ }
1237	1262	}
1238	1263	}
1239	1264
...	...
...	...	@@ -510,7 +510,7 @@ class Utils
510	510	static function macGenerate()
511	511	{
512	512	$adrArray = [ "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F" ];
513		- $returnMAC = [];
	513	+ $returnMAC = '';
514	514
515	515	for($i = 1; $i < 13 ; $i++) {
516	516	$index = 0;
...	...	@@ -522,17 +522,26 @@ class Utils
522	522	$index = $indexArray[mt_rand(0, 7)];
523	523	}
524	524
525		- $returnMAC[] = $adrArray[$index];
	525	+ $returnMAC = $returnMAC . $adrArray[$index];
526	526	}
527		- $returnStr = '';
528		- foreach ($returnMAC as $k => $v) {
529	527
530		- if (0 == ($k % 2) && 0 != $k) {
531		- $returnStr = $returnStr.":";
532		- }
533		- $returnStr = $returnStr.$v;
	528	+ return self::coverToMacAddress($returnMAC);
	529	+ }
	530	+
	531	+ /**
	532	+ * 把mac地址转化为带：的字符串
	533	+ * @param $macStr
	534	+ * @return string
	535	+ */
	536	+ static function coverToMacAddress($macStr)
	537	+ {
	538	+ if (empty($macStr)) {
	539	+ return null;
534	540	}
535	541
	542	+ $macSplitArr = str_split($macStr, 2);
	543	+ $returnStr = implode(":", $macSplitArr);
	544	+
536	545	return $returnStr;
537	546	}
538	547	}
539	548	\ No newline at end of file
...	...