From 64104a0a321b8b78597fa9e90c453b42eb91de97 Mon Sep 17 00:00:00 2001 From: zhaoxiang <756958008@qq.com> Date: Sun, 25 Feb 2018 23:26:29 +0800 Subject: [PATCH] =?UTF-8?q?modified=20=E5=8F=98=E6=9B=B4=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E5=87=BD=E6=95=B0=EF=BC=8C=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/App.php | 5 +++-- application/admin/controller/AppGroup.php | 3 ++- application/admin/controller/Auth.php | 9 ++++---- application/admin/controller/Base.php | 21 ------------------- application/admin/controller/Fields.php | 7 ++++--- .../admin/controller/InterfaceGroup.php | 3 ++- .../admin/controller/InterfaceList.php | 3 ++- application/admin/controller/Menu.php | 3 ++- application/admin/controller/User.php | 12 +++++------ application/util/DataType.php | 6 +----- application/util/Tools.php | 21 +++++++++++++++++++ 11 files changed, 48 insertions(+), 45 deletions(-) diff --git a/application/admin/controller/App.php b/application/admin/controller/App.php index a3e277d..839323a 100644 --- a/application/admin/controller/App.php +++ b/application/admin/controller/App.php @@ -13,6 +13,7 @@ use app\model\ApiList; use app\model\ApiGroup; use app\util\ReturnCode; use app\util\Strs; +use app\util\Tools; class App extends Base { /** @@ -46,7 +47,7 @@ class App extends Base { $listInfo = (new ApiApp())->where($where)->order('app_addTime', 'DESC')->limit($start, $limit)->select(); $count = (new ApiApp())->where($where)->count(); - $listInfo = $this->buildArrFromObj($listInfo); + $listInfo = Tools::buildArrFromObj($listInfo); return $this->buildSuccess([ 'list' => $listInfo, @@ -67,7 +68,7 @@ class App extends Base { $res['apiList'][$api['groupHash']][] = $api; } $groupArr = ApiGroup::all(); - $groupArr = $this->buildArrFromObj($groupArr); + $groupArr = Tools::buildArrFromObj($groupArr); $res['groupInfo'] = array_column($groupArr, 'name', 'hash'); $res['groupInfo']['default'] = '默认分组'; $id = $this->request->get('id', 0); diff --git a/application/admin/controller/AppGroup.php b/application/admin/controller/AppGroup.php index db96a48..4bb648e 100644 --- a/application/admin/controller/AppGroup.php +++ b/application/admin/controller/AppGroup.php @@ -10,6 +10,7 @@ namespace app\admin\controller; use app\model\ApiAppGroup; use app\util\ReturnCode; +use app\util\Tools; class AppGroup extends Base { /** @@ -44,7 +45,7 @@ class AppGroup extends Base { $listInfo = (new ApiAppGroup())->where($where)->limit($start, $limit)->select(); $count = (new ApiAppGroup())->where($where)->count(); - $listInfo = $this->buildArrFromObj($listInfo); + $listInfo = Tools::buildArrFromObj($listInfo); return $this->buildSuccess([ 'list' => $listInfo, diff --git a/application/admin/controller/Auth.php b/application/admin/controller/Auth.php index b998e65..abe2b68 100644 --- a/application/admin/controller/Auth.php +++ b/application/admin/controller/Auth.php @@ -13,6 +13,7 @@ use app\model\ApiAuthGroupAccess; use app\model\ApiAuthRule; use app\model\ApiMenu; use app\util\ReturnCode; +use app\util\Tools; class Auth extends Base { @@ -38,7 +39,7 @@ class Auth extends Base { $listInfo = (new ApiAuthGroup())->where($where)->order('id', 'DESC')->limit($start, $limit)->select(); $count = (new ApiAuthGroup())->where($where)->count(); - $listInfo = $this->buildArrFromObj($listInfo); + $listInfo = Tools::buildArrFromObj($listInfo); return $this->buildSuccess([ 'list' => $listInfo, @@ -57,7 +58,7 @@ class Auth extends Base { public function getGroups() { $listInfo = (new ApiAuthGroup())->where(['status' => 1])->order('id', 'DESC')->select(); $count = count($listInfo); - $listInfo = $this->buildArrFromObj($listInfo); + $listInfo = Tools::buildArrFromObj($listInfo); return $this->buildSuccess([ 'list' => $listInfo, @@ -77,7 +78,7 @@ class Auth extends Base { $groupId = $this->request->get('groupId', 0); $list = (new ApiMenu)->where([])->order('sort', 'ASC')->select(); - $list = $this->buildArrFromObj($list); + $list = Tools::buildArrFromObj($list); $list = listToTree($list); $rules = []; @@ -269,7 +270,7 @@ class Auth extends Base { $postData = $this->request->post(); $needAdd = []; $has = (new ApiAuthRule())->where(['groupId' => $postData['id']])->select(); - $has = $this->buildArrFromObj($has); + $has = Tools::buildArrFromObj($has); $hasRule = array_column($has, 'url'); $needDel = array_flip($hasRule); foreach ($postData['rules'] as $key => $value) { diff --git a/application/admin/controller/Base.php b/application/admin/controller/Base.php index f3c3baf..0ce50e4 100644 --- a/application/admin/controller/Base.php +++ b/application/admin/controller/Base.php @@ -58,27 +58,6 @@ class Base extends Controller { return $list; } - /** - * 将查询的二维对象转换成二维数组 - * @param array $res - * @param string $key - * @return array - * @author zhaoxiang - */ - protected function buildArrFromObj($res, $key = '') { - $arr = []; - foreach ($res as $value) { - $value = $value->toArray(); - if ($key) { - $arr[$value[$key]] = $value; - } else { - $arr[] = $value; - } - } - - return $arr; - } - protected function debug($data) { if ($data) { $this->debug[] = $data; diff --git a/application/admin/controller/Fields.php b/application/admin/controller/Fields.php index 68d7217..ca0cdc7 100644 --- a/application/admin/controller/Fields.php +++ b/application/admin/controller/Fields.php @@ -12,6 +12,7 @@ use app\model\ApiFields; use app\model\ApiList; use app\util\DataType; use app\util\ReturnCode; +use app\util\Tools; class Fields extends Base { private $dataType = array( @@ -45,7 +46,7 @@ class Fields extends Base { if (!empty($hash)) { $listInfo = (new ApiFields())->where(['hash' => $hash, 'type' => 0])->limit($start, $limit)->select(); $count = (new ApiFields())->where(['hash' => $hash, 'type' => 0])->count(); - $listInfo = $this->buildArrFromObj($listInfo); + $listInfo = Tools::buildArrFromObj($listInfo); return $this->buildSuccess([ 'list' => $listInfo, @@ -73,7 +74,7 @@ class Fields extends Base { if (!empty($hash)) { $listInfo = (new ApiFields())->where(['hash' => $hash, 'type' => 1])->limit($start, $limit)->select(); $count = (new ApiFields())->where(['hash' => $hash, 'type' => 1])->count(); - $listInfo = $this->buildArrFromObj($listInfo); + $listInfo = Tools::buildArrFromObj($listInfo); return $this->buildSuccess([ 'list' => $listInfo, @@ -159,7 +160,7 @@ class Fields extends Base { 'hash' => $hash, 'type' => $type ])->select(); - $old = $this->buildArrFromObj($old); + $old = Tools::buildArrFromObj($old); $oldArr = array_column($old, 'showName'); $newArr = array_column($dataArr, 'showName'); $addArr = array_diff($newArr, $oldArr); diff --git a/application/admin/controller/InterfaceGroup.php b/application/admin/controller/InterfaceGroup.php index 478b4a0..0662517 100644 --- a/application/admin/controller/InterfaceGroup.php +++ b/application/admin/controller/InterfaceGroup.php @@ -10,6 +10,7 @@ namespace app\admin\controller; use app\model\ApiGroup; use app\util\ReturnCode; +use app\util\Tools; class InterfaceGroup extends Base { /** @@ -44,7 +45,7 @@ class InterfaceGroup extends Base { $listInfo = (new ApiGroup())->where($where)->limit($start, $limit)->select(); $count = (new ApiGroup())->where($where)->count(); - $listInfo = $this->buildArrFromObj($listInfo); + $listInfo = Tools::buildArrFromObj($listInfo); return $this->buildSuccess([ 'list' => $listInfo, diff --git a/application/admin/controller/InterfaceList.php b/application/admin/controller/InterfaceList.php index 0f6622f..26fe438 100644 --- a/application/admin/controller/InterfaceList.php +++ b/application/admin/controller/InterfaceList.php @@ -11,6 +11,7 @@ namespace app\admin\controller; use app\model\ApiFields; use app\model\ApiList; use app\util\ReturnCode; +use app\util\Tools; class InterfaceList extends Base { /** @@ -49,7 +50,7 @@ class InterfaceList extends Base { $listInfo = (new ApiList())->where($where)->order('id', 'DESC')->limit($start, $limit)->select(); $count = (new ApiList())->where($where)->count(); - $listInfo = $this->buildArrFromObj($listInfo); + $listInfo = Tools::buildArrFromObj($listInfo); return $this->buildSuccess([ 'list' => $listInfo, diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php index 7c7f4a6..977dbd6 100644 --- a/application/admin/controller/Menu.php +++ b/application/admin/controller/Menu.php @@ -10,6 +10,7 @@ namespace app\admin\controller; use app\model\ApiMenu; use app\util\ReturnCode; +use app\util\Tools; class Menu extends Base { @@ -21,7 +22,7 @@ class Menu extends Base { */ public function index() { $list = (new ApiMenu)->where([])->order('sort', 'ASC')->select(); - $list = $this->buildArrFromObj($list); + $list = Tools::buildArrFromObj($list); $list = formatTree(listToTree($list)); return $this->buildSuccess([ diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index 6d4af8f..ed57d90 100644 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -49,19 +49,19 @@ class User extends Base { $listInfo = (new ApiUser())->where($where)->order('regTime', 'DESC')->limit($start, $limit)->select(); $count = (new ApiUser())->where($where)->count(); - $listInfo = $this->buildArrFromObj($listInfo); + $listInfo = Tools::buildArrFromObj($listInfo); $idArr = array_column($listInfo, 'id'); $userData = ApiUserData::all(function($query) use ($idArr) { $query->whereIn('uid', $idArr); }); - $userData = $this->buildArrFromObj($userData); + $userData = Tools::buildArrFromObj($userData); $userData = $this->buildArrByNewKey($userData, 'uid'); $userGroup = ApiAuthGroupAccess::all(function($query) use ($idArr) { $query->whereIn('uid', $idArr); }); - $userGroup = $this->buildArrFromObj($userGroup); + $userGroup = Tools::buildArrFromObj($userGroup); $userGroup = $this->buildArrByNewKey($userGroup, 'uid'); foreach ($listInfo as $key => $value) { @@ -129,17 +129,17 @@ class User extends Base { } $listInfo = (new ApiAuthGroupAccess())->where(['groupId' => ['like', "%{$gid}%"]])->select(); - $listInfo = $this->buildArrFromObj($listInfo); + $listInfo = Tools::buildArrFromObj($listInfo); $uidArr = array_column($listInfo, 'uid'); $userInfo = (new ApiUser())->whereIn('id', $uidArr)->order('regTime', 'DESC')->limit($start, $limit)->select(); $count = (new ApiUser())->whereIn('id', $uidArr)->count(); - $userInfo = $this->buildArrFromObj($userInfo); + $userInfo = Tools::buildArrFromObj($userInfo); $userData = ApiUserData::all(function($query) use ($uidArr) { $query->whereIn('uid', $uidArr); }); - $userData = $this->buildArrFromObj($userData); + $userData = Tools::buildArrFromObj($userData); $userData = $this->buildArrByNewKey($userData, 'uid'); foreach ($userInfo as $key => $value) { diff --git a/application/util/DataType.php b/application/util/DataType.php index 0f31e83..e558302 100644 --- a/application/util/DataType.php +++ b/application/util/DataType.php @@ -21,8 +21,4 @@ class DataType { const TYPE_MOBILE = 8; const TYPE_OBJECT = 9; - //JPush推送消息类型 - const PUSH_SYSTEM_DATA = 1; - const PUSH_ACTIVITY_DATA = 2; - -} \ No newline at end of file +} diff --git a/application/util/Tools.php b/application/util/Tools.php index 103dd88..b1007e0 100644 --- a/application/util/Tools.php +++ b/application/util/Tools.php @@ -76,4 +76,25 @@ class Tools { return false; } + + /** + * 将查询的二维对象转换成二维数组 + * @param array $res + * @param string $key 允许指定索引值 + * @return array + * @author zhaoxiang + */ + public static function buildArrFromObj($res, $key = '') { + $arr = []; + foreach ($res as $value) { + $value = $value->toArray(); + if ($key) { + $arr[$value[$key]] = $value; + } else { + $arr[] = $value; + } + } + + return $arr; + } }