周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 ef805181afed86261a4530eade7b0c4ccaa045c4 1 个父辈 807f90a2

gx

内嵌 并排对比
正在显示 15 个修改的文件 包含 202 行增加 和 117 行删除
... ... @@ -26,17 +26,18 @@ class BaseController extends Controller
protected $map = [];//处理后的参数
protected $uid = 0;
protected $manage = [];//当前登录用户详情
/**
* 获取所有参数
* @param Request $request
*/
public function __construct(Request $request)
{
$this->request = $request;
$this->param = $this->request->all();
$this->token = $this->request->header('token');
$this->get_param();
if(!empty($this->token) && !empty(Cache::get(Common::MANAGE_TOKEN . $this->token))){
$this->getParam();
$info = Cache::get(Common::MANAGE_TOKEN . $this->token);
if(!empty($this->token) && !empty($info)){
$this->manage = $info;
$this->uid = $info['id'];
}
... ... @@ -44,42 +45,33 @@ class BaseController extends Controller
/**
* 成功返回
* @param array $data
* @param string $code
* @param bool $objectData
* @return JsonResponse
* @throws \Psr\Container\ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface
* @remark :请求参数处理
* @name :getParam
* @author :lyh
* @method :post
* @time :2023/6/17 16:34
*/
function success(array $data = [], string $code = Code::SUCCESS, bool $objectData = false): JsonResponse
{
if ($objectData) {
$data = (object)$data;
public function getParam(){
foreach ($this->param as $k => $v){
if(is_array($v)){
$this->getParam();
}else{
if(empty($v)){
unset($this->param[$k]);
}
$this->getMap($k,$v);
}
}
$code = Code::fromValue($code);
$response = [
'code' => $code->value,
'data' => $data,
'message' => $code->description,
];
$this->header['token'] = $this->token;
return response()->json($response,200,$this->header);
}
/**
* @remark :请求参数处理
* @name :get_param
* @remark :搜索参数处理
* @name :getMap
* @author :lyh
* @method :post
* @time :2023/6/17 16:34
* @time :2023/8/28 10:22
*/
public function get_param(){
$param = $this->param;
foreach ($param as $k => $v){
if(is_array($v)){
continue;
}
public function getMap($k,$v){
switch ($k){
case "order":
$this->order = $v;
... ... @@ -109,8 +101,6 @@ class BaseController extends Controller
break;
}
}
}
/**
* @param $msg
* @param string $code
... ... @@ -137,6 +127,26 @@ class BaseController extends Controller
throw new HttpResponseException($response);
}
/**
* @remark :返回json
* @name :success
* @author :lyh
* @method :post
* @time :2023/8/28 10:18
*/
function success(array $data = [], string $code = Code::SUCCESS, bool $objectData = false): JsonResponse
{
if ($objectData) {
$data = (object)$data;
}
$code = Code::fromValue($code);
$response = [
'code' => $code->value,
'data' => $data,
'message' => $code->description,
];
$this->header['token'] = $this->token;
return response()->json($response,200,$this->header);
}
}
... ...
... ... @@ -2,6 +2,7 @@
namespace App\Http\Controllers\Aside\Com;
use App\Enums\Common\Code;
use App\Http\Controllers\Aside\BaseController;
use App\Http\Logic\Aside\Manage\MenuLogic;
... ... @@ -29,7 +30,7 @@ class IndexController extends BaseController
}else{
$menus = $logic->getMenuByGroupId($this->manage['gid']);
}
return $this->success($menus);
$this->response('success',Code::SUCCESS,$menus);
}
}
... ...
... ... @@ -64,8 +64,9 @@ class ServerConfigController extends BaseController
* @date 2023/4/23
*/
public function save(ServerConfigRequest $request, ServerConfigLogic $logic){
$data = $logic->serviceConfigSave();
return $this->success($data);
$request->validated();
$logic->serviceConfigSave();
$this->response('success');
}
/**
... ... @@ -117,7 +118,7 @@ class ServerConfigController extends BaseController
$data = $logic->updateAllTable($this->param);
break;
}
return $this->success($data);
$this->response('success',Code::SUCCESS,$data);
}
}
... ...
... ... @@ -38,13 +38,13 @@ class LoginController extends BaseController
'password.required' => '请输入密码',
]);
$data = $logic->login();
return $this->success($data);
$this->response('success',Code::SUCCESS,$data);
}
public function logout(LoginLogic $logic)
{
$logic->logout();
return $this->success();
$this->response('success');
}
/**
... ...
... ... @@ -2,6 +2,7 @@
namespace App\Http\Controllers\Aside\Manage;
use App\Enums\Common\Code;
use App\Helper\Arr;
use App\Http\Controllers\Aside\BaseController;
use App\Http\Logic\Aside\Manage\DeptLogic;
... ... @@ -26,7 +27,7 @@ class DeptController extends BaseController
}
$sort = ['id' => 'desc'];
$data = $logic->getList($map, $sort, ['id', 'pid', 'title'],0);
return $this->success(Arr::listToTree($data));
$this->response('success',Code::SUCCESS,Arr::listToTree($data));
}
public function info(Request $request, DeptLogic $logic){
... ... @@ -36,24 +37,24 @@ class DeptController extends BaseController
'id.required' => 'ID不能为空'
]);
$data = $logic->getInfo($this->param['id']);
return $this->success(Arr::twoKeepKeys($data, ['id', 'pid', 'title', 'manager_uids', 'remark']));
$this->response('success',Code::SUCCESS,Arr::twoKeepKeys($data, ['id', 'pid', 'title', 'manager_uids', 'remark']));
}
public function save(DeptRequest $request, DeptLogic $logic)
{
$data = $logic->save($this->param);
return $this->success($data);
$request->validated();
$logic->save($this->param);
$this->response('success');
}
public function delete(Request $request, DeptLogic $logic)
public function delete(DeptLogic $logic)
{
$request->validate([
$this->request->validate([
'ids'=>['required', new Ids()]
],[
'ids.required' => 'ID不能为空'
]);
$data = $logic->delete($this->param['ids']);
return $this->success($data);
$logic->delete($this->param['ids']);
$this->response('success');;
}
}
... ...
... ... @@ -2,6 +2,7 @@
namespace App\Http\Controllers\Aside\Manage;
use App\Enums\Common\Code;
use App\Helper\Arr;
use App\Http\Controllers\Aside\BaseController;
use App\Http\Logic\Aside\Manage\GroupLogic;
... ... @@ -19,41 +20,68 @@ use Illuminate\Http\Request;
class GroupController extends BaseController
{
public function list(Request $request, GroupLogic $logic)
/**
* @remark :列表
* @name :list
* @author :lyh
* @method :post
* @time :2023/8/28 10:01
*/
public function list(GroupLogic $logic)
{
$map = [];
if(!empty($this->param['search'])){
$map[] = ['title', 'like', "%{$this->param['search']}%"];
}
$list = $logic->getList($map, ['id' => 'desc'], ['*'], 0);
return $this->success($list);
$this->response('success',Code::SUCCESS,$list);
}
public function info(Request $request, GroupLogic $logic){
$request->validate([
/**
* @remark :详情
* @name :info
* @author :lyh
* @method :post
* @time :2023/8/28 10:01
*/
public function info(GroupLogic $logic){
$this->request->validate([
'id'=>'required'
],[
'id.required' => 'ID不能为空'
]);
$data = $logic->getInfo($this->param['id']);
return $this->success($data);
$this->response('success',Code::SUCCESS,$data);
}
/**
* @remark :保存
* @name :save
* @author :lyh
* @method :post
* @time :2023/8/28 10:02
*/
public function save(GroupRequest $request, GroupLogic $logic){
$data = $logic->save($this->param);
return $this->success($data);
$request->validated();
$logic->save($this->param);
$this->response('success');
}
public function delete(Request $request, GroupLogic $logic){
$request->validate([
/**
* @remark :删除
* @name :delete
* @author :lyh
* @method :post
* @time :2023/8/28 10:03
*/
public function delete(GroupLogic $logic){
$this->request->validate([
'ids'=>['required', new Ids()]
],[
'ids.required' => 'ID不能为空'
]);
$data = $logic->delete($this->param['ids']);
return $this->success($data);
$logic->delete($this->param['ids']);
$this->response('success');
}
}
... ...
... ... @@ -39,7 +39,7 @@ class HrController extends BaseController
$info['photo_gallery_link'] = $info['photo_gallery'];
$info['id_card_gallery_link'] = $info['id_card_gallery'];
$info['certificate_gallery_link'] = $info['certificate_gallery'];
return $this->success($info);
$this->response('success',Code::SUCCESS,$info);
}
public function save(HrLogic $logic){
... ...
... ... @@ -2,6 +2,7 @@
namespace App\Http\Controllers\Aside\Manage;
use App\Enums\Common\Code;
use App\Helper\Arr;
use App\Http\Controllers\Aside\BaseController;
use App\Http\Logic\Aside\Manage\ManageLogic;
... ... @@ -20,6 +21,13 @@ use Illuminate\Http\Request;
class ManageController extends BaseController
{
/**
* @remark :列表
* @name :list
* @author :lyh
* @method :post
* @time :2023/8/28 10:04
*/
public function list(Request $request, ManageLogic $logic)
{
$map = [];
... ... @@ -33,11 +41,18 @@ class ManageController extends BaseController
$map[] = ['gid', $this->param['gid']];
}
$list = $logic->getList($map,['sort' => 'desc'],['*'],$this->row);
return $this->success($list);
$this->response('success',Code::SUCCESS,$list);
}
public function info(Request $request, ManageLogic $logic){
$request->validate([
/**
* @remark :详情
* @name :info
* @author :lyh
* @method :post
* @time :2023/8/28 10:04
*/
public function info(ManageLogic $logic){
$this->request->validate([
'id'=>'required'
],[
'id.required' => 'ID不能为空'
... ... @@ -46,23 +61,30 @@ class ManageController extends BaseController
//获取当前用户特殊模块权限
$specialMenuModel = new MenuSpecial();
$data['special'] = $specialMenuModel->list(['user_list'=>['like','%,'.$this->param['id'].',%']],'id',['id','name','remark']);
return $this->success($data);
$this->response('success',Code::SUCCESS,$data);
}
/**
* @remark :保存
* @name :save
* @author :lyh
* @method :post
* @time :2023/8/28 10:04
*/
public function save(ManageRequest $request, ManageLogic $logic){
$data = $logic->save($this->param);
return $this->success($data);
$request->validated();
$logic->save($this->param);
$this->response('success');
}
public function delete(Request $request, ManageLogic $logic){
$request->validate([
public function delete(ManageLogic $logic){
$this->request->validate([
'ids'=>['required', new Ids()]
],[
'ids.required' => 'ID不能为空'
]);
$data = $logic->delete($this->param['ids']);
return $this->success($data);
$logic->delete($this->param['ids']);
$this->response('success');
}
/**
... ...
... ... @@ -36,30 +36,51 @@ class MenuController extends BaseController
$this->response('success',Code::SUCCESS,$lists);
}
public function info(Request $request, MenuLogic $logic){
$request->validate([
/**
* @remark :详情
* @name :info
* @author :lyh
* @method :post
* @time :2023/8/28 10:06
*/
public function info(MenuLogic $logic){
$this->request->validate([
'id'=>'required'
],[
'id.required' => 'ID不能为空'
]);
$data = $logic->getInfo($this->param['id']);
return $this->success($data);
$this->response('success',Code::SUCCESS,$data);
}
/**
* @remark :保存
* @name :save
* @author :lyh
* @method :post
* @time :2023/8/28 10:06
*/
public function save(MenuRequest $request, MenuLogic $logic){
$data = $logic->save($this->param);
return $this->success($data);
$request->validated();
$logic->save($this->param);
$this->response('success');
}
public function delete(Request $request, MenuLogic $logic){
$request->validate([
/**
* @remark :删除
* @name :delete
* @author :lyh
* @method :post
* @time :2023/8/28 10:07
*/
public function delete(MenuLogic $logic){
$this->request->validate([
'ids'=>['required', new Ids()]
],[
'ids.required' => 'ID不能为空'
]);
$data = $logic->delete($this->param['ids']);
return $this->success($data);
$logic->delete($this->param['ids']);
$this->response('success');
}
/**
* @remark :排序
... ...
... ... @@ -75,7 +75,7 @@ class RoleMenuController extends BaseController
$list[] = $name;
}
}
return $this->success($list);
$this->response('success',Code::SUCCESS,$list);;
}
/**
* @remark :保存权限菜单
... ...
... ... @@ -28,7 +28,7 @@ class NoticeController extends BaseController
//首次 续费
LogUtils::info('notice project', $this->param);
NoticeLog::createLog(NoticeLog::TYPE_PROJECT, $this->param);
return $this->success();
$this->response('success');
}
}
... ...
... ... @@ -72,7 +72,7 @@ class ProjectController extends BaseController
}
$sort = ['id' => 'desc'];
$data = $logic->getList($map, $sort,['*'],$this->row);
return $this->success($data);
$this->response('success',Code::SUCCESS,$data);
}
/**
... ... @@ -101,8 +101,8 @@ class ProjectController extends BaseController
*/
public function save(ProjectRequest $request, ProjectLogic $logic)
{
$data = $logic->save($this->param);
return $this->success($data);
$logic->save($this->param);
$this->response('success');
}
/**
... ... @@ -128,11 +128,10 @@ class ProjectController extends BaseController
}else{
$data = $data->toArray();
}
return $this->success($data);
$this->response('success',Code::SUCCESS,$data);
}
$data = $logic->saveInquirySet($this->param);
return $this->success($data);
$this->response('success',Code::SUCCESS,$data);
}
... ... @@ -147,7 +146,7 @@ class ProjectController extends BaseController
*/
public function data_source(ProjectLogic $logic){
$data = $logic->dataSource();
return $this->success($data);
$this->response('success',Code::SUCCESS,$data);
}
/**
... ... @@ -161,7 +160,7 @@ class ProjectController extends BaseController
*/
public function city_source(){
$data = City::source($this->param['id'] ?? 0);
return $this->success($data);
$this->response('success',Code::SUCCESS,$data);
}
/**
... ... @@ -175,7 +174,7 @@ class ProjectController extends BaseController
*/
public function channel_source(ProjectLogic $logic){
$data = $logic->channelSource($this->param);
return $this->success($data);
$this->response('success',Code::SUCCESS,$data);
}
/**
... ... @@ -190,7 +189,7 @@ class ProjectController extends BaseController
'project_id.required' => '项目ID不能为空'
]);
$data = $logic->getInfo($this->param['project_id']);
return $this->success($data);
$this->response('success',Code::SUCCESS,$data);
}
/**
... ... @@ -200,7 +199,7 @@ class ProjectController extends BaseController
*/
public function save_process_records(ProcessRecordsRequest $request, ProcessRecordsLogic $logic){
$data = $logic->save($this->param);
return $this->success($data);
$this->response('success',Code::SUCCESS,$data);
}
/**
... ... @@ -216,7 +215,7 @@ class ProjectController extends BaseController
]);
$payment = Payment::where('project_id', $this->param['id'])->select(['contract', 'bill'])->first();
$data = $payment->makeVisible(['contract', 'bill']);
return $this->success($data ? $data->toArray() : []);
$this->response('success',Code::SUCCESS,$data ? $data->toArray() : []);
}
/**
... ... @@ -231,7 +230,7 @@ class ProjectController extends BaseController
'id.required' => 'ID不能为空'
]);
$logic->saveOnlineCheck();
return $this->success();
$this->response('success');
}
/**
... ... @@ -252,7 +251,7 @@ class ProjectController extends BaseController
'status.in' => '审核状态值无效',
]);
$logic->onlineCheck($this->param);
return $this->success();
$this->response('success');
}
/**
... ...
... ... @@ -80,9 +80,10 @@ class TaskController extends BaseController
*/
public function save(TaskRequest $request, TaskLogic $logic)
{
$request->validated();
$this->param['created_manage_id'] = $this->manage->id;
$data = $logic->save($this->param);
return $this->success($data);
$logic->save($this->param);
$this->response('success');
}
/**
... ... @@ -92,7 +93,7 @@ class TaskController extends BaseController
* @author zbj
* @date 2023/4/27
*/
public function status(Request $request, TaskLogic $logic){
public function status(TaskLogic $logic){
$this->request->validate([
'id'=>'required',
'status' => ['required', Rule::in(array_keys(Task::statusMap()))]
... ... @@ -101,8 +102,8 @@ class TaskController extends BaseController
'status.required' => '请选择状态',
'status.in' => '状态值不正确',
]);
$data = $logic->status();
return $this->success($data);
$logic->status();
$this->response('success');
}
... ... @@ -114,8 +115,9 @@ class TaskController extends BaseController
* @date 2023/4/27
*/
public function save_follow(TaskFollowRequest $request, TaskFollowLogic $logic){
$data = $logic->save($this->param);
return $this->success($data);
$request->validated();
$logic->save($this->param);
$this->response('success');
}
/**
... ...
... ... @@ -123,7 +123,7 @@ class ProjectMenuController extends BaseController
$list[] = $name;
}
}
return $this->success($list);
$this->response('success',Code::SUCCESS,$list);
}
/**
... ...
... ... @@ -136,8 +136,8 @@ class ProjectLogic extends BaseLogic
* @time :2023/8/17 14:19
*/
public function save($param){
// DB::beginTransaction();
// try {
DB::beginTransaction();
try {
if($param['type'] == Project::TYPE_FIVE){
$param['extend_type'] == Project::TYPE_FIVE;
unset($param['type']);
... ... @@ -152,11 +152,11 @@ class ProjectLogic extends BaseLogic
if(isset($param['mysql_id']) && !empty($param['mysql_id'])){
$this->initializationMysql($res['id']);
}
// DB::commit();
// }catch (\Exception $e){
// DB::rollBack();
// $this->fail('保存失败');
// }
DB::commit();
}catch (\Exception $e){
DB::rollBack();
$this->fail('保存失败');
}
return $this->success();
}
... ... @@ -310,7 +310,7 @@ class ProjectLogic extends BaseLogic
$data['type'] = $this->model::typeMap();
$data['special'] = $this->model::specialMap();
$data['plan'] = $this->model::planMap();
return $data;
return $this->success($data);
}
... ... @@ -323,7 +323,7 @@ class ProjectLogic extends BaseLogic
case Project::TYPE_THREE:
return User::where('channel_id', $param['channel_id']??0)->pluck('name', 'id')->toArray();
}
return [];
return $this->success();
}
... ...