周海龙 / globalso · 提交

转到一个项目

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

gx

内嵌 并排对比
正在显示 15 个修改的文件 包含 230 行增加 和 145 行删除
@@ -26,17 +26,18 @@ class BaseController extends Controller @@ -26,17 +26,18 @@ class BaseController extends Controller
26 protected $map = [];//处理后的参数 26 protected $map = [];//处理后的参数
27 protected $uid = 0; 27 protected $uid = 0;
28 protected $manage = [];//当前登录用户详情 28 protected $manage = [];//当前登录用户详情
  29 +
29 /** 30 /**
30 - * 获取所有参数 31 + * @param Request $request
31 */ 32 */
32 public function __construct(Request $request) 33 public function __construct(Request $request)
33 { 34 {
34 $this->request = $request; 35 $this->request = $request;
35 $this->param = $this->request->all(); 36 $this->param = $this->request->all();
36 $this->token = $this->request->header('token'); 37 $this->token = $this->request->header('token');
37 - $this->get_param();  
38 - if(!empty($this->token) && !empty(Cache::get(Common::MANAGE_TOKEN . $this->token))){  
39 - $info = Cache::get(Common::MANAGE_TOKEN . $this->token); 38 + $this->getParam();
  39 + $info = Cache::get(Common::MANAGE_TOKEN . $this->token);
  40 + if(!empty($this->token) && !empty($info)){
40 $this->manage = $info; 41 $this->manage = $info;
41 $this->uid = $info['id']; 42 $this->uid = $info['id'];
42 } 43 }
@@ -44,74 +45,63 @@ class BaseController extends Controller @@ -44,74 +45,63 @@ class BaseController extends Controller
44 45
45 46
46 /** 47 /**
47 - * 成功返回  
48 - * @param array $data  
49 - * @param string $code  
50 - * @param bool $objectData  
51 - * @return JsonResponse  
52 - * @throws \Psr\Container\ContainerExceptionInterface  
53 - * @throws \Psr\Container\NotFoundExceptionInterface  
54 - */  
55 - function success(array $data = [], string $code = Code::SUCCESS, bool $objectData = false): JsonResponse  
56 - {  
57 - if ($objectData) {  
58 - $data = (object)$data;  
59 - }  
60 - $code = Code::fromValue($code);  
61 - $response = [  
62 - 'code' => $code->value,  
63 - 'data' => $data,  
64 - 'message' => $code->description,  
65 - ];  
66 - $this->header['token'] = $this->token;  
67 - return response()->json($response,200,$this->header);  
68 - }  
69 -  
70 - /**  
71 * @remark :请求参数处理 48 * @remark :请求参数处理
72 - * @name :get_param 49 + * @name :getParam
73 * @author :lyh 50 * @author :lyh
74 * @method :post 51 * @method :post
75 * @time :2023/6/17 16:34 52 * @time :2023/6/17 16:34
76 */ 53 */
77 - public function get_param(){  
78 - $param = $this->param;  
79 - foreach ($param as $k => $v){ 54 + public function getParam(){
  55 + foreach ($this->param as $k => $v){
80 if(is_array($v)){ 56 if(is_array($v)){
81 - continue;  
82 - }  
83 - switch ($k){  
84 - case "order":  
85 - $this->order = $v;  
86 - break;  
87 - case 'page':  
88 - $this->page = $v;  
89 - break;  
90 - case 'row':  
91 - $this->row = $v;  
92 - break;  
93 - case "name":  
94 - $this->map['name'] = ['like','%'.$v.'%'];  
95 - break;  
96 - case "start_at":  
97 - $this->_btw[0] = $v;  
98 - $this->_btw[1] = date('Y-m-d H:i:s',time());  
99 - $this->map['created_at'] = ['between', $this->_btw];  
100 - break;  
101 - case "end_at":  
102 - $this->_btw[1] = $v;  
103 - $this->map['updated_at'] = ['between', $this->_btw];  
104 - break;  
105 - default:  
106 - if (!empty($v) || $v == 0) {  
107 - $this->map[$k] = $v;  
108 - }  
109 - break; 57 + $this->getParam();
  58 + }else{
  59 + if(empty($v)){
  60 + unset($this->param[$k]);
  61 + }
  62 + $this->getMap($k,$v);
110 } 63 }
111 } 64 }
112 } 65 }
113 66
114 /** 67 /**
  68 + * @remark :搜索参数处理
  69 + * @name :getMap
  70 + * @author :lyh
  71 + * @method :post
  72 + * @time :2023/8/28 10:22
  73 + */
  74 + public function getMap($k,$v){
  75 + switch ($k){
  76 + case "order":
  77 + $this->order = $v;
  78 + break;
  79 + case 'page':
  80 + $this->page = $v;
  81 + break;
  82 + case 'row':
  83 + $this->row = $v;
  84 + break;
  85 + case "name":
  86 + $this->map['name'] = ['like','%'.$v.'%'];
  87 + break;
  88 + case "start_at":
  89 + $this->_btw[0] = $v;
  90 + $this->_btw[1] = date('Y-m-d H:i:s',time());
  91 + $this->map['created_at'] = ['between', $this->_btw];
  92 + break;
  93 + case "end_at":
  94 + $this->_btw[1] = $v;
  95 + $this->map['updated_at'] = ['between', $this->_btw];
  96 + break;
  97 + default:
  98 + if (!empty($v) || $v == 0) {
  99 + $this->map[$k] = $v;
  100 + }
  101 + break;
  102 + }
  103 + }
  104 + /**
115 * @param $msg 105 * @param $msg
116 * @param string $code 106 * @param string $code
117 * @param $data 107 * @param $data
@@ -137,6 +127,26 @@ class BaseController extends Controller @@ -137,6 +127,26 @@ class BaseController extends Controller
137 throw new HttpResponseException($response); 127 throw new HttpResponseException($response);
138 } 128 }
139 129
140 - 130 + /**
  131 + * @remark :返回json
  132 + * @name :success
  133 + * @author :lyh
  134 + * @method :post
  135 + * @time :2023/8/28 10:18
  136 + */
  137 + function success(array $data = [], string $code = Code::SUCCESS, bool $objectData = false): JsonResponse
  138 + {
  139 + if ($objectData) {
  140 + $data = (object)$data;
  141 + }
  142 + $code = Code::fromValue($code);
  143 + $response = [
  144 + 'code' => $code->value,
  145 + 'data' => $data,
  146 + 'message' => $code->description,
  147 + ];
  148 + $this->header['token'] = $this->token;
  149 + return response()->json($response,200,$this->header);
  150 + }
141 151
142 } 152 }
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 2
3 namespace App\Http\Controllers\Aside\Com; 3 namespace App\Http\Controllers\Aside\Com;
4 4
  5 +use App\Enums\Common\Code;
5 use App\Http\Controllers\Aside\BaseController; 6 use App\Http\Controllers\Aside\BaseController;
6 use App\Http\Logic\Aside\Manage\MenuLogic; 7 use App\Http\Logic\Aside\Manage\MenuLogic;
7 8
@@ -29,7 +30,7 @@ class IndexController extends BaseController @@ -29,7 +30,7 @@ class IndexController extends BaseController
29 }else{ 30 }else{
30 $menus = $logic->getMenuByGroupId($this->manage['gid']); 31 $menus = $logic->getMenuByGroupId($this->manage['gid']);
31 } 32 }
32 - return $this->success($menus); 33 + $this->response('success',Code::SUCCESS,$menus);
33 } 34 }
34 35
35 } 36 }
@@ -64,8 +64,9 @@ class ServerConfigController extends BaseController @@ -64,8 +64,9 @@ class ServerConfigController extends BaseController
64 * @date 2023/4/23 64 * @date 2023/4/23
65 */ 65 */
66 public function save(ServerConfigRequest $request, ServerConfigLogic $logic){ 66 public function save(ServerConfigRequest $request, ServerConfigLogic $logic){
67 - $data = $logic->serviceConfigSave();  
68 - return $this->success($data); 67 + $request->validated();
  68 + $logic->serviceConfigSave();
  69 + $this->response('success');
69 } 70 }
70 71
71 /** 72 /**
@@ -117,7 +118,7 @@ class ServerConfigController extends BaseController @@ -117,7 +118,7 @@ class ServerConfigController extends BaseController
117 $data = $logic->updateAllTable($this->param); 118 $data = $logic->updateAllTable($this->param);
118 break; 119 break;
119 } 120 }
120 - return $this->success($data); 121 + $this->response('success',Code::SUCCESS,$data);
121 } 122 }
122 123
123 } 124 }
@@ -38,13 +38,13 @@ class LoginController extends BaseController @@ -38,13 +38,13 @@ class LoginController extends BaseController
38 'password.required' => '请输入密码', 38 'password.required' => '请输入密码',
39 ]); 39 ]);
40 $data = $logic->login(); 40 $data = $logic->login();
41 - return $this->success($data); 41 + $this->response('success',Code::SUCCESS,$data);
42 } 42 }
43 43
44 public function logout(LoginLogic $logic) 44 public function logout(LoginLogic $logic)
45 { 45 {
46 $logic->logout(); 46 $logic->logout();
47 - return $this->success(); 47 + $this->response('success');
48 } 48 }
49 49
50 /** 50 /**
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 2
3 namespace App\Http\Controllers\Aside\Manage; 3 namespace App\Http\Controllers\Aside\Manage;
4 4
  5 +use App\Enums\Common\Code;
5 use App\Helper\Arr; 6 use App\Helper\Arr;
6 use App\Http\Controllers\Aside\BaseController; 7 use App\Http\Controllers\Aside\BaseController;
7 use App\Http\Logic\Aside\Manage\DeptLogic; 8 use App\Http\Logic\Aside\Manage\DeptLogic;
@@ -26,7 +27,7 @@ class DeptController extends BaseController @@ -26,7 +27,7 @@ class DeptController extends BaseController
26 } 27 }
27 $sort = ['id' => 'desc']; 28 $sort = ['id' => 'desc'];
28 $data = $logic->getList($map, $sort, ['id', 'pid', 'title'],0); 29 $data = $logic->getList($map, $sort, ['id', 'pid', 'title'],0);
29 - return $this->success(Arr::listToTree($data)); 30 + $this->response('success',Code::SUCCESS,Arr::listToTree($data));
30 } 31 }
31 32
32 public function info(Request $request, DeptLogic $logic){ 33 public function info(Request $request, DeptLogic $logic){
@@ -36,24 +37,24 @@ class DeptController extends BaseController @@ -36,24 +37,24 @@ class DeptController extends BaseController
36 'id.required' => 'ID不能为空' 37 'id.required' => 'ID不能为空'
37 ]); 38 ]);
38 $data = $logic->getInfo($this->param['id']); 39 $data = $logic->getInfo($this->param['id']);
39 - return $this->success(Arr::twoKeepKeys($data, ['id', 'pid', 'title', 'manager_uids', 'remark'])); 40 + $this->response('success',Code::SUCCESS,Arr::twoKeepKeys($data, ['id', 'pid', 'title', 'manager_uids', 'remark']));
40 } 41 }
41 42
42 public function save(DeptRequest $request, DeptLogic $logic) 43 public function save(DeptRequest $request, DeptLogic $logic)
43 { 44 {
44 - $data = $logic->save($this->param);  
45 - return $this->success($data); 45 + $request->validated();
  46 + $logic->save($this->param);
  47 + $this->response('success');
46 } 48 }
47 49
48 - public function delete(Request $request, DeptLogic $logic) 50 + public function delete(DeptLogic $logic)
49 { 51 {
50 - $request->validate([ 52 + $this->request->validate([
51 'ids'=>['required', new Ids()] 53 'ids'=>['required', new Ids()]
52 ],[ 54 ],[
53 'ids.required' => 'ID不能为空' 55 'ids.required' => 'ID不能为空'
54 ]); 56 ]);
55 -  
56 - $data = $logic->delete($this->param['ids']);  
57 - return $this->success($data); 57 + $logic->delete($this->param['ids']);
  58 + $this->response('success');;
58 } 59 }
59 } 60 }
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 2
3 namespace App\Http\Controllers\Aside\Manage; 3 namespace App\Http\Controllers\Aside\Manage;
4 4
  5 +use App\Enums\Common\Code;
5 use App\Helper\Arr; 6 use App\Helper\Arr;
6 use App\Http\Controllers\Aside\BaseController; 7 use App\Http\Controllers\Aside\BaseController;
7 use App\Http\Logic\Aside\Manage\GroupLogic; 8 use App\Http\Logic\Aside\Manage\GroupLogic;
@@ -19,41 +20,68 @@ use Illuminate\Http\Request; @@ -19,41 +20,68 @@ use Illuminate\Http\Request;
19 class GroupController extends BaseController 20 class GroupController extends BaseController
20 { 21 {
21 22
22 - public function list(Request $request, GroupLogic $logic) 23 + /**
  24 + * @remark :列表
  25 + * @name :list
  26 + * @author :lyh
  27 + * @method :post
  28 + * @time :2023/8/28 10:01
  29 + */
  30 + public function list(GroupLogic $logic)
23 { 31 {
24 $map = []; 32 $map = [];
25 if(!empty($this->param['search'])){ 33 if(!empty($this->param['search'])){
26 $map[] = ['title', 'like', "%{$this->param['search']}%"]; 34 $map[] = ['title', 'like', "%{$this->param['search']}%"];
27 } 35 }
28 $list = $logic->getList($map, ['id' => 'desc'], ['*'], 0); 36 $list = $logic->getList($map, ['id' => 'desc'], ['*'], 0);
29 - return $this->success($list); 37 + $this->response('success',Code::SUCCESS,$list);
30 } 38 }
31 39
32 -  
33 - public function info(Request $request, GroupLogic $logic){  
34 - $request->validate([ 40 + /**
  41 + * @remark :详情
  42 + * @name :info
  43 + * @author :lyh
  44 + * @method :post
  45 + * @time :2023/8/28 10:01
  46 + */
  47 + public function info(GroupLogic $logic){
  48 + $this->request->validate([
35 'id'=>'required' 49 'id'=>'required'
36 ],[ 50 ],[
37 'id.required' => 'ID不能为空' 51 'id.required' => 'ID不能为空'
38 ]); 52 ]);
39 $data = $logic->getInfo($this->param['id']); 53 $data = $logic->getInfo($this->param['id']);
40 - return $this->success($data); 54 + $this->response('success',Code::SUCCESS,$data);
41 } 55 }
42 56
  57 + /**
  58 + * @remark :保存
  59 + * @name :save
  60 + * @author :lyh
  61 + * @method :post
  62 + * @time :2023/8/28 10:02
  63 + */
43 public function save(GroupRequest $request, GroupLogic $logic){ 64 public function save(GroupRequest $request, GroupLogic $logic){
44 - $data = $logic->save($this->param);  
45 - return $this->success($data); 65 + $request->validated();
  66 + $logic->save($this->param);
  67 + $this->response('success');
46 } 68 }
47 69
48 - public function delete(Request $request, GroupLogic $logic){  
49 - $request->validate([ 70 + /**
  71 + * @remark :删除
  72 + * @name :delete
  73 + * @author :lyh
  74 + * @method :post
  75 + * @time :2023/8/28 10:03
  76 + */
  77 + public function delete(GroupLogic $logic){
  78 + $this->request->validate([
50 'ids'=>['required', new Ids()] 79 'ids'=>['required', new Ids()]
51 ],[ 80 ],[
52 'ids.required' => 'ID不能为空' 81 'ids.required' => 'ID不能为空'
53 ]); 82 ]);
54 -  
55 - $data = $logic->delete($this->param['ids']);  
56 - return $this->success($data); 83 + $logic->delete($this->param['ids']);
  84 + $this->response('success');
57 } 85 }
58 86
59 } 87 }
@@ -39,7 +39,7 @@ class HrController extends BaseController @@ -39,7 +39,7 @@ class HrController extends BaseController
39 $info['photo_gallery_link'] = $info['photo_gallery']; 39 $info['photo_gallery_link'] = $info['photo_gallery'];
40 $info['id_card_gallery_link'] = $info['id_card_gallery']; 40 $info['id_card_gallery_link'] = $info['id_card_gallery'];
41 $info['certificate_gallery_link'] = $info['certificate_gallery']; 41 $info['certificate_gallery_link'] = $info['certificate_gallery'];
42 - return $this->success($info); 42 + $this->response('success',Code::SUCCESS,$info);
43 } 43 }
44 44
45 public function save(HrLogic $logic){ 45 public function save(HrLogic $logic){
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 2
3 namespace App\Http\Controllers\Aside\Manage; 3 namespace App\Http\Controllers\Aside\Manage;
4 4
  5 +use App\Enums\Common\Code;
5 use App\Helper\Arr; 6 use App\Helper\Arr;
6 use App\Http\Controllers\Aside\BaseController; 7 use App\Http\Controllers\Aside\BaseController;
7 use App\Http\Logic\Aside\Manage\ManageLogic; 8 use App\Http\Logic\Aside\Manage\ManageLogic;
@@ -20,6 +21,13 @@ use Illuminate\Http\Request; @@ -20,6 +21,13 @@ use Illuminate\Http\Request;
20 class ManageController extends BaseController 21 class ManageController extends BaseController
21 { 22 {
22 23
  24 + /**
  25 + * @remark :列表
  26 + * @name :list
  27 + * @author :lyh
  28 + * @method :post
  29 + * @time :2023/8/28 10:04
  30 + */
23 public function list(Request $request, ManageLogic $logic) 31 public function list(Request $request, ManageLogic $logic)
24 { 32 {
25 $map = []; 33 $map = [];
@@ -33,11 +41,18 @@ class ManageController extends BaseController @@ -33,11 +41,18 @@ class ManageController extends BaseController
33 $map[] = ['gid', $this->param['gid']]; 41 $map[] = ['gid', $this->param['gid']];
34 } 42 }
35 $list = $logic->getList($map,['sort' => 'desc'],['*'],$this->row); 43 $list = $logic->getList($map,['sort' => 'desc'],['*'],$this->row);
36 - return $this->success($list); 44 + $this->response('success',Code::SUCCESS,$list);
37 } 45 }
38 46
39 - public function info(Request $request, ManageLogic $logic){  
40 - $request->validate([ 47 + /**
  48 + * @remark :详情
  49 + * @name :info
  50 + * @author :lyh
  51 + * @method :post
  52 + * @time :2023/8/28 10:04
  53 + */
  54 + public function info(ManageLogic $logic){
  55 + $this->request->validate([
41 'id'=>'required' 56 'id'=>'required'
42 ],[ 57 ],[
43 'id.required' => 'ID不能为空' 58 'id.required' => 'ID不能为空'
@@ -46,23 +61,30 @@ class ManageController extends BaseController @@ -46,23 +61,30 @@ class ManageController extends BaseController
46 //获取当前用户特殊模块权限 61 //获取当前用户特殊模块权限
47 $specialMenuModel = new MenuSpecial(); 62 $specialMenuModel = new MenuSpecial();
48 $data['special'] = $specialMenuModel->list(['user_list'=>['like','%,'.$this->param['id'].',%']],'id',['id','name','remark']); 63 $data['special'] = $specialMenuModel->list(['user_list'=>['like','%,'.$this->param['id'].',%']],'id',['id','name','remark']);
49 - return $this->success($data); 64 + $this->response('success',Code::SUCCESS,$data);
50 } 65 }
51 66
  67 + /**
  68 + * @remark :保存
  69 + * @name :save
  70 + * @author :lyh
  71 + * @method :post
  72 + * @time :2023/8/28 10:04
  73 + */
52 public function save(ManageRequest $request, ManageLogic $logic){ 74 public function save(ManageRequest $request, ManageLogic $logic){
53 - $data = $logic->save($this->param);  
54 - return $this->success($data); 75 + $request->validated();
  76 + $logic->save($this->param);
  77 + $this->response('success');
55 } 78 }
56 79
57 - public function delete(Request $request, ManageLogic $logic){  
58 - $request->validate([ 80 + public function delete(ManageLogic $logic){
  81 + $this->request->validate([
59 'ids'=>['required', new Ids()] 82 'ids'=>['required', new Ids()]
60 ],[ 83 ],[
61 'ids.required' => 'ID不能为空' 84 'ids.required' => 'ID不能为空'
62 ]); 85 ]);
63 -  
64 - $data = $logic->delete($this->param['ids']);  
65 - return $this->success($data); 86 + $logic->delete($this->param['ids']);
  87 + $this->response('success');
66 } 88 }
67 89
68 /** 90 /**
@@ -36,30 +36,51 @@ class MenuController extends BaseController @@ -36,30 +36,51 @@ class MenuController extends BaseController
36 $this->response('success',Code::SUCCESS,$lists); 36 $this->response('success',Code::SUCCESS,$lists);
37 } 37 }
38 38
39 - public function info(Request $request, MenuLogic $logic){  
40 - $request->validate([ 39 + /**
  40 + * @remark :详情
  41 + * @name :info
  42 + * @author :lyh
  43 + * @method :post
  44 + * @time :2023/8/28 10:06
  45 + */
  46 + public function info(MenuLogic $logic){
  47 + $this->request->validate([
41 'id'=>'required' 48 'id'=>'required'
42 ],[ 49 ],[
43 'id.required' => 'ID不能为空' 50 'id.required' => 'ID不能为空'
44 ]); 51 ]);
45 $data = $logic->getInfo($this->param['id']); 52 $data = $logic->getInfo($this->param['id']);
46 - return $this->success($data); 53 + $this->response('success',Code::SUCCESS,$data);
47 } 54 }
48 55
  56 + /**
  57 + * @remark :保存
  58 + * @name :save
  59 + * @author :lyh
  60 + * @method :post
  61 + * @time :2023/8/28 10:06
  62 + */
49 public function save(MenuRequest $request, MenuLogic $logic){ 63 public function save(MenuRequest $request, MenuLogic $logic){
50 - $data = $logic->save($this->param);  
51 - return $this->success($data); 64 + $request->validated();
  65 + $logic->save($this->param);
  66 + $this->response('success');
52 } 67 }
53 68
54 - public function delete(Request $request, MenuLogic $logic){  
55 - $request->validate([ 69 + /**
  70 + * @remark :删除
  71 + * @name :delete
  72 + * @author :lyh
  73 + * @method :post
  74 + * @time :2023/8/28 10:07
  75 + */
  76 + public function delete(MenuLogic $logic){
  77 + $this->request->validate([
56 'ids'=>['required', new Ids()] 78 'ids'=>['required', new Ids()]
57 ],[ 79 ],[
58 'ids.required' => 'ID不能为空' 80 'ids.required' => 'ID不能为空'
59 ]); 81 ]);
60 -  
61 - $data = $logic->delete($this->param['ids']);  
62 - return $this->success($data); 82 + $logic->delete($this->param['ids']);
  83 + $this->response('success');
63 } 84 }
64 /** 85 /**
65 * @remark :排序 86 * @remark :排序
@@ -75,7 +75,7 @@ class RoleMenuController extends BaseController @@ -75,7 +75,7 @@ class RoleMenuController extends BaseController
75 $list[] = $name; 75 $list[] = $name;
76 } 76 }
77 } 77 }
78 - return $this->success($list); 78 + $this->response('success',Code::SUCCESS,$list);;
79 } 79 }
80 /** 80 /**
81 * @remark :保存权限菜单 81 * @remark :保存权限菜单
@@ -28,7 +28,7 @@ class NoticeController extends BaseController @@ -28,7 +28,7 @@ class NoticeController extends BaseController
28 //首次 续费 28 //首次 续费
29 LogUtils::info('notice project', $this->param); 29 LogUtils::info('notice project', $this->param);
30 NoticeLog::createLog(NoticeLog::TYPE_PROJECT, $this->param); 30 NoticeLog::createLog(NoticeLog::TYPE_PROJECT, $this->param);
31 - return $this->success(); 31 + $this->response('success');
32 } 32 }
33 33
34 } 34 }
@@ -72,7 +72,7 @@ class ProjectController extends BaseController @@ -72,7 +72,7 @@ class ProjectController extends BaseController
72 } 72 }
73 $sort = ['id' => 'desc']; 73 $sort = ['id' => 'desc'];
74 $data = $logic->getList($map, $sort,['*'],$this->row); 74 $data = $logic->getList($map, $sort,['*'],$this->row);
75 - return $this->success($data); 75 + $this->response('success',Code::SUCCESS,$data);
76 } 76 }
77 77
78 /** 78 /**
@@ -101,8 +101,8 @@ class ProjectController extends BaseController @@ -101,8 +101,8 @@ class ProjectController extends BaseController
101 */ 101 */
102 public function save(ProjectRequest $request, ProjectLogic $logic) 102 public function save(ProjectRequest $request, ProjectLogic $logic)
103 { 103 {
104 - $data = $logic->save($this->param);  
105 - return $this->success($data); 104 + $logic->save($this->param);
  105 + $this->response('success');
106 } 106 }
107 107
108 /** 108 /**
@@ -128,11 +128,10 @@ class ProjectController extends BaseController @@ -128,11 +128,10 @@ class ProjectController extends BaseController
128 }else{ 128 }else{
129 $data = $data->toArray(); 129 $data = $data->toArray();
130 } 130 }
131 - return $this->success($data); 131 + $this->response('success',Code::SUCCESS,$data);
132 } 132 }
133 -  
134 $data = $logic->saveInquirySet($this->param); 133 $data = $logic->saveInquirySet($this->param);
135 - return $this->success($data); 134 + $this->response('success',Code::SUCCESS,$data);
136 } 135 }
137 136
138 137
@@ -147,7 +146,7 @@ class ProjectController extends BaseController @@ -147,7 +146,7 @@ class ProjectController extends BaseController
147 */ 146 */
148 public function data_source(ProjectLogic $logic){ 147 public function data_source(ProjectLogic $logic){
149 $data = $logic->dataSource(); 148 $data = $logic->dataSource();
150 - return $this->success($data); 149 + $this->response('success',Code::SUCCESS,$data);
151 } 150 }
152 151
153 /** 152 /**
@@ -161,7 +160,7 @@ class ProjectController extends BaseController @@ -161,7 +160,7 @@ class ProjectController extends BaseController
161 */ 160 */
162 public function city_source(){ 161 public function city_source(){
163 $data = City::source($this->param['id'] ?? 0); 162 $data = City::source($this->param['id'] ?? 0);
164 - return $this->success($data); 163 + $this->response('success',Code::SUCCESS,$data);
165 } 164 }
166 165
167 /** 166 /**
@@ -175,7 +174,7 @@ class ProjectController extends BaseController @@ -175,7 +174,7 @@ class ProjectController extends BaseController
175 */ 174 */
176 public function channel_source(ProjectLogic $logic){ 175 public function channel_source(ProjectLogic $logic){
177 $data = $logic->channelSource($this->param); 176 $data = $logic->channelSource($this->param);
178 - return $this->success($data); 177 + $this->response('success',Code::SUCCESS,$data);
179 } 178 }
180 179
181 /** 180 /**
@@ -190,7 +189,7 @@ class ProjectController extends BaseController @@ -190,7 +189,7 @@ class ProjectController extends BaseController
190 'project_id.required' => '项目ID不能为空' 189 'project_id.required' => '项目ID不能为空'
191 ]); 190 ]);
192 $data = $logic->getInfo($this->param['project_id']); 191 $data = $logic->getInfo($this->param['project_id']);
193 - return $this->success($data); 192 + $this->response('success',Code::SUCCESS,$data);
194 } 193 }
195 194
196 /** 195 /**
@@ -200,7 +199,7 @@ class ProjectController extends BaseController @@ -200,7 +199,7 @@ class ProjectController extends BaseController
200 */ 199 */
201 public function save_process_records(ProcessRecordsRequest $request, ProcessRecordsLogic $logic){ 200 public function save_process_records(ProcessRecordsRequest $request, ProcessRecordsLogic $logic){
202 $data = $logic->save($this->param); 201 $data = $logic->save($this->param);
203 - return $this->success($data); 202 + $this->response('success',Code::SUCCESS,$data);
204 } 203 }
205 204
206 /** 205 /**
@@ -216,7 +215,7 @@ class ProjectController extends BaseController @@ -216,7 +215,7 @@ class ProjectController extends BaseController
216 ]); 215 ]);
217 $payment = Payment::where('project_id', $this->param['id'])->select(['contract', 'bill'])->first(); 216 $payment = Payment::where('project_id', $this->param['id'])->select(['contract', 'bill'])->first();
218 $data = $payment->makeVisible(['contract', 'bill']); 217 $data = $payment->makeVisible(['contract', 'bill']);
219 - return $this->success($data ? $data->toArray() : []); 218 + $this->response('success',Code::SUCCESS,$data ? $data->toArray() : []);
220 } 219 }
221 220
222 /** 221 /**
@@ -231,7 +230,7 @@ class ProjectController extends BaseController @@ -231,7 +230,7 @@ class ProjectController extends BaseController
231 'id.required' => 'ID不能为空' 230 'id.required' => 'ID不能为空'
232 ]); 231 ]);
233 $logic->saveOnlineCheck(); 232 $logic->saveOnlineCheck();
234 - return $this->success(); 233 + $this->response('success');
235 } 234 }
236 235
237 /** 236 /**
@@ -252,7 +251,7 @@ class ProjectController extends BaseController @@ -252,7 +251,7 @@ class ProjectController extends BaseController
252 'status.in' => '审核状态值无效', 251 'status.in' => '审核状态值无效',
253 ]); 252 ]);
254 $logic->onlineCheck($this->param); 253 $logic->onlineCheck($this->param);
255 - return $this->success(); 254 + $this->response('success');
256 } 255 }
257 256
258 /** 257 /**
@@ -80,9 +80,10 @@ class TaskController extends BaseController @@ -80,9 +80,10 @@ class TaskController extends BaseController
80 */ 80 */
81 public function save(TaskRequest $request, TaskLogic $logic) 81 public function save(TaskRequest $request, TaskLogic $logic)
82 { 82 {
  83 + $request->validated();
83 $this->param['created_manage_id'] = $this->manage->id; 84 $this->param['created_manage_id'] = $this->manage->id;
84 - $data = $logic->save($this->param);  
85 - return $this->success($data); 85 + $logic->save($this->param);
  86 + $this->response('success');
86 } 87 }
87 88
88 /** 89 /**
@@ -92,7 +93,7 @@ class TaskController extends BaseController @@ -92,7 +93,7 @@ class TaskController extends BaseController
92 * @author zbj 93 * @author zbj
93 * @date 2023/4/27 94 * @date 2023/4/27
94 */ 95 */
95 - public function status(Request $request, TaskLogic $logic){ 96 + public function status(TaskLogic $logic){
96 $this->request->validate([ 97 $this->request->validate([
97 'id'=>'required', 98 'id'=>'required',
98 'status' => ['required', Rule::in(array_keys(Task::statusMap()))] 99 'status' => ['required', Rule::in(array_keys(Task::statusMap()))]
@@ -101,8 +102,8 @@ class TaskController extends BaseController @@ -101,8 +102,8 @@ class TaskController extends BaseController
101 'status.required' => '请选择状态', 102 'status.required' => '请选择状态',
102 'status.in' => '状态值不正确', 103 'status.in' => '状态值不正确',
103 ]); 104 ]);
104 - $data = $logic->status();  
105 - return $this->success($data); 105 + $logic->status();
  106 + $this->response('success');
106 } 107 }
107 108
108 109
@@ -114,8 +115,9 @@ class TaskController extends BaseController @@ -114,8 +115,9 @@ class TaskController extends BaseController
114 * @date 2023/4/27 115 * @date 2023/4/27
115 */ 116 */
116 public function save_follow(TaskFollowRequest $request, TaskFollowLogic $logic){ 117 public function save_follow(TaskFollowRequest $request, TaskFollowLogic $logic){
117 - $data = $logic->save($this->param);  
118 - return $this->success($data); 118 + $request->validated();
  119 + $logic->save($this->param);
  120 + $this->response('success');
119 } 121 }
120 122
121 /** 123 /**
@@ -123,7 +123,7 @@ class ProjectMenuController extends BaseController @@ -123,7 +123,7 @@ class ProjectMenuController extends BaseController
123 $list[] = $name; 123 $list[] = $name;
124 } 124 }
125 } 125 }
126 - return $this->success($list); 126 + $this->response('success',Code::SUCCESS,$list);
127 } 127 }
128 128
129 /** 129 /**
@@ -136,8 +136,8 @@ class ProjectLogic extends BaseLogic @@ -136,8 +136,8 @@ class ProjectLogic extends BaseLogic
136 * @time :2023/8/17 14:19 136 * @time :2023/8/17 14:19
137 */ 137 */
138 public function save($param){ 138 public function save($param){
139 -// DB::beginTransaction();  
140 -// try { 139 + DB::beginTransaction();
  140 + try {
141 if($param['type'] == Project::TYPE_FIVE){ 141 if($param['type'] == Project::TYPE_FIVE){
142 $param['extend_type'] == Project::TYPE_FIVE; 142 $param['extend_type'] == Project::TYPE_FIVE;
143 unset($param['type']); 143 unset($param['type']);
@@ -152,11 +152,11 @@ class ProjectLogic extends BaseLogic @@ -152,11 +152,11 @@ class ProjectLogic extends BaseLogic
152 if(isset($param['mysql_id']) && !empty($param['mysql_id'])){ 152 if(isset($param['mysql_id']) && !empty($param['mysql_id'])){
153 $this->initializationMysql($res['id']); 153 $this->initializationMysql($res['id']);
154 } 154 }
155 -// DB::commit();  
156 -// }catch (\Exception $e){  
157 -// DB::rollBack();  
158 -// $this->fail('保存失败');  
159 -// } 155 + DB::commit();
  156 + }catch (\Exception $e){
  157 + DB::rollBack();
  158 + $this->fail('保存失败');
  159 + }
160 return $this->success(); 160 return $this->success();
161 } 161 }
162 162
@@ -310,7 +310,7 @@ class ProjectLogic extends BaseLogic @@ -310,7 +310,7 @@ class ProjectLogic extends BaseLogic
310 $data['type'] = $this->model::typeMap(); 310 $data['type'] = $this->model::typeMap();
311 $data['special'] = $this->model::specialMap(); 311 $data['special'] = $this->model::specialMap();
312 $data['plan'] = $this->model::planMap(); 312 $data['plan'] = $this->model::planMap();
313 - return $data; 313 + return $this->success($data);
314 } 314 }
315 315
316 316
@@ -323,7 +323,7 @@ class ProjectLogic extends BaseLogic @@ -323,7 +323,7 @@ class ProjectLogic extends BaseLogic
323 case Project::TYPE_THREE: 323 case Project::TYPE_THREE:
324 return User::where('channel_id', $param['channel_id']??0)->pluck('name', 'id')->toArray(); 324 return User::where('channel_id', $param['channel_id']??0)->pluck('name', 'id')->toArray();
325 } 325 }
326 - return []; 326 + return $this->success();
327 } 327 }
328 328
329 329