私域操盘手 - 所有API统一响应格式

This commit is contained in:
柳清爽
2025-05-07 18:16:02 +08:00
parent 6fa41e3f4a
commit b5939b36b3
8 changed files with 29 additions and 67 deletions

View File

@@ -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());
}
}
}

View File

@@ -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());
}
}
}

View File

@@ -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());
}
}
}

View File

@@ -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());
}
}
}

View File

@@ -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());
}
}
}

View File

@@ -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());
}
}
}

View File

@@ -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());
}
}
}

View File

@@ -141,7 +141,6 @@ class AddAdministratorController extends BaseController
}
Db::commit();
return ResponseHelper::success();
} catch (\Exception $e) {
Db::rollback();