diff --git a/Server/application/cunkebao/controller/device/GetDeviceDetailV1Controller.php b/Server/application/cunkebao/controller/device/GetDeviceDetailV1Controller.php index 05bf1b93..f7e84799 100644 --- a/Server/application/cunkebao/controller/device/GetDeviceDetailV1Controller.php +++ b/Server/application/cunkebao/controller/device/GetDeviceDetailV1Controller.php @@ -8,6 +8,7 @@ use app\common\model\DeviceUser as DeviceUserModel; use app\common\model\DeviceWechatLogin; use app\common\model\WechatFriend; use app\cunkebao\controller\BaseController; +use library\ResponseHelper; /** * 设备管理控制器 @@ -152,25 +153,17 @@ class GetDeviceDetailV1Controller extends BaseController public function index() { try { - // 获取设备ID $id = $this->request->param('id/d'); if ($this->getUserInfo('isAdmin') != 1) { $this->checkUserDevicePermission($id); } - $info = $this->getDeviceInfo($id); + $resultSet = $this->getDeviceInfo($id); - return json([ - 'code' => 200, - 'msg' => '获取成功', - 'data' => $info - ]); + return ResponseHelper::success($resultSet); } catch (\Exception $e) { - return json([ - 'code' => $e->getMessage(), - 'msg' => $e->getMessage() - ]); + return ResponseHelper::error($e->getMessage(), $e->getCode()); } } } \ No newline at end of file diff --git a/Server/application/cunkebao/controller/device/GetDeviceHandleLogsV1Controller.php b/Server/application/cunkebao/controller/device/GetDeviceHandleLogsV1Controller.php index cec957e1..25eacd47 100644 --- a/Server/application/cunkebao/controller/device/GetDeviceHandleLogsV1Controller.php +++ b/Server/application/cunkebao/controller/device/GetDeviceHandleLogsV1Controller.php @@ -5,6 +5,7 @@ namespace app\cunkebao\controller\device; use app\common\model\DeviceHandleLog; use app\common\model\DeviceUser as DeviceUserModel; use app\cunkebao\controller\BaseController; +use library\ResponseHelper; /** * 设备管理控制器 @@ -69,19 +70,14 @@ class GetDeviceHandleLogsV1Controller extends BaseController $logs = $this->getHandleLogs($deviceId); - return json([ - 'code' => 200, - 'msg' => '获取成功', - 'data' => [ + return ResponseHelper::success( + [ 'total' => $logs->total(), - 'list' => $logs->items() + 'list' => $logs->items() ] - ]); + ); } catch (\Exception $e) { - return json([ - 'code' => $e->getCode(), - 'msg' => $e->getMessage() - ]); + return ResponseHelper::error($e->getMessage(), $e->getCode()); } } } \ No newline at end of file diff --git a/Server/application/cunkebao/controller/device/GetDeviceListV1Controller.php b/Server/application/cunkebao/controller/device/GetDeviceListV1Controller.php index a4767003..e08d91b9 100644 --- a/Server/application/cunkebao/controller/device/GetDeviceListV1Controller.php +++ b/Server/application/cunkebao/controller/device/GetDeviceListV1Controller.php @@ -6,6 +6,7 @@ use app\common\model\Device as DeviceModel; use app\common\model\DeviceUser as DeviceUserModel; use app\common\model\WechatFriend; use app\cunkebao\controller\BaseController; +use library\ResponseHelper; /** * 设备管理控制器 @@ -126,19 +127,14 @@ class GetDeviceListV1Controller extends BaseController $result = $this->getDeviceList($where); } - return json([ - 'code' => 200, - 'msg' => '获取成功', - 'data' => [ + return ResponseHelper::success( + [ 'list' => $this->countFriend($result), 'total' => $result->total(), ] - ]); + ); } catch (\Exception $e) { - return json([ - 'code' => $e->getCode(), - 'msg' => $e->getMessage() - ]); + return ResponseHelper::error($e->getMessage(), $e->getCode()); } } } \ No newline at end of file diff --git a/Server/application/cunkebao/controller/device/GetRelatedAccountsV1Controller.php b/Server/application/cunkebao/controller/device/GetRelatedAccountsV1Controller.php index 2891db7e..3677c22a 100644 --- a/Server/application/cunkebao/controller/device/GetRelatedAccountsV1Controller.php +++ b/Server/application/cunkebao/controller/device/GetRelatedAccountsV1Controller.php @@ -7,6 +7,7 @@ use app\common\model\DeviceWechatLogin as DeviceWechatLoginModel; use app\common\model\WechatAccount as WechatAccountModel; use app\common\model\WechatFriend; use app\cunkebao\controller\BaseController; +use library\ResponseHelper; /** * 设备管理控制器 @@ -154,20 +155,15 @@ class GetRelatedAccountsV1Controller extends BaseController // 获取设备关联的微信账号 $wechatAccounts = $this->getDeviceRelatedAccounts($deviceId); - return json([ - 'code' => 200, - 'msg' => '获取成功', - 'data' => [ + return ResponseHelper::success( + [ 'deviceId' => $deviceId, 'accounts' => $wechatAccounts, 'total' => count($wechatAccounts) ] - ]); + ); } catch (\Exception $e) { - return json([ - 'code' => $e->getCode(), - 'msg' => $e->getMessage() - ]); + return ResponseHelper::error($e->getMessage(), $e->getCode()); } } } \ No newline at end of file diff --git a/Server/application/cunkebao/controller/device/PostAddDeviceV1Controller.php b/Server/application/cunkebao/controller/device/PostAddDeviceV1Controller.php index cc44d91e..dbb069dd 100644 --- a/Server/application/cunkebao/controller/device/PostAddDeviceV1Controller.php +++ b/Server/application/cunkebao/controller/device/PostAddDeviceV1Controller.php @@ -5,6 +5,7 @@ namespace app\cunkebao\controller\device; use app\common\model\Device as DeviceModel; use app\common\model\DeviceHandleLog as DeviceHandleLogModel; use app\cunkebao\controller\BaseController; +use library\ResponseHelper; use library\s2\CurlHandle; use think\Db; use think\Validate; @@ -115,17 +116,10 @@ class PostAddDeviceV1Controller extends BaseController Db::commit(); - return json([ - 'code' => 200, - 'msg' => '添加成功' - ]); + return ResponseHelper::success(); } catch (\Exception $e) { Db::rollback(); - - return json([ - 'code' => $e->getCode(), - 'msg' => $e->getMessage() - ]); + return ResponseHelper::error($e->getMessage(), $e->getCode()); } } } \ No newline at end of file diff --git a/Server/application/cunkebao/controller/device/RefreshDeviceDetailV1Controller.php b/Server/application/cunkebao/controller/device/RefreshDeviceDetailV1Controller.php index db6adaad..5ea260a0 100644 --- a/Server/application/cunkebao/controller/device/RefreshDeviceDetailV1Controller.php +++ b/Server/application/cunkebao/controller/device/RefreshDeviceDetailV1Controller.php @@ -3,6 +3,7 @@ namespace app\cunkebao\controller\device; use app\cunkebao\controller\BaseController; +use library\ResponseHelper; /** * 设备管理控制器 @@ -17,16 +18,9 @@ class RefreshDeviceDetailV1Controller extends BaseController { try { // TODO: 实现实际刷新设备状态的功能 - - return json([ - 'code' => 200, - 'msg' => '刷新成功', - ]); + return ResponseHelper::success(); } catch (\Exception $e) { - return json([ - 'code' => $e->getCode(), - 'msg' => $e->getMessage() - ]); + return ResponseHelper::error($e->getMessage(), $e->getCode()); } } } \ No newline at end of file diff --git a/Server/application/cunkebao/controller/device/UpdateDeviceTaskConfigV1Controller.php b/Server/application/cunkebao/controller/device/UpdateDeviceTaskConfigV1Controller.php index e1da2e00..b6182220 100644 --- a/Server/application/cunkebao/controller/device/UpdateDeviceTaskConfigV1Controller.php +++ b/Server/application/cunkebao/controller/device/UpdateDeviceTaskConfigV1Controller.php @@ -7,6 +7,7 @@ use app\common\model\DeviceHandleLog as DeviceHandleLogModel; use app\common\model\DeviceTaskconf; use app\common\model\DeviceUser as DeviceUserModel; use app\cunkebao\controller\BaseController; +use library\ResponseHelper; use think\Db; /** @@ -130,17 +131,10 @@ class UpdateDeviceTaskConfigV1Controller extends BaseController Db::commit(); - return json([ - 'code' => 200, - 'msg' => '更新任务配置成功' - ]); + return ResponseHelper::success(); } catch (\Exception $e) { Db::rollback(); - - return json([ - 'code' => $e->getCode(), - 'msg' => $e->getMessage() - ]); + return ResponseHelper::error($e->getMessage(), $e->getCode()); } } } \ No newline at end of file diff --git a/Server/application/superadmin/controller/administrator/AddAdministratorController.php b/Server/application/superadmin/controller/administrator/AddAdministratorController.php index dc9551e3..f0f6e19f 100644 --- a/Server/application/superadmin/controller/administrator/AddAdministratorController.php +++ b/Server/application/superadmin/controller/administrator/AddAdministratorController.php @@ -141,7 +141,6 @@ class AddAdministratorController extends BaseController } Db::commit(); - return ResponseHelper::success(); } catch (\Exception $e) { Db::rollback();