作者 lyh

gx

@@ -41,6 +41,13 @@ class LoginController extends BaseController @@ -41,6 +41,13 @@ class LoginController extends BaseController
41 $this->response('success',Code::SUCCESS,$data); 41 $this->response('success',Code::SUCCESS,$data);
42 } 42 }
43 43
  44 + /**
  45 + * @remark :退出登录
  46 + * @name :logout
  47 + * @author :lyh
  48 + * @method :post
  49 + * @time :2023/9/7 16:29
  50 + */
44 public function logout(LoginLogic $logic) 51 public function logout(LoginLogic $logic)
45 { 52 {
46 $logic->logout(); 53 $logic->logout();
@@ -47,126 +47,203 @@ class ProjectController extends BaseController @@ -47,126 +47,203 @@ class ProjectController extends BaseController
47 * @time :2023/8/30 10:11 47 * @time :2023/8/30 10:11
48 */ 48 */
49 public function lists(Project $project){ 49 public function lists(Project $project){
50 - $map = [];  
51 - //搜索参数处理  
52 - $map = $this->searchParam($map,$this->map);  
53 - //类型  
54 - if(isset($this->map['type'])){  
55 - $map['type'] = $this->searchType($this->map['type']);  
56 - $map['extend_type'] = 0;//排除未续费项目  
57 - }  
58 - $filed = ['id', 'title', 'mysql_id' ,'channel','cooperate_date' ,'type', 'remain_day' ,'created_at'];  
59 - $lists = $project->formatQuery($map)->orderBy('id','desc')->select($filed)->with('payment')->with('deploy_build')  
60 - ->with('deploy_optimize')->with('online_check')->paginate($this->row, ['*'], 'page', $this->page);  
61 - if(!empty($lists)){  
62 - $lists = $lists->toArray();  
63 - $manageModel = new Manage();  
64 - $domainModel = new DomainInfo();  
65 - foreach ($lists['list'] as $k=>$item){  
66 - $item = $this->handleParam($item,$manageModel,$domainModel);  
67 - $lists['list'][$k] = $item; 50 + $query = $project->leftJoin('gl_project_payment', 'gl_project.id', '=', 'gl_project_payment.project_id')
  51 + ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
  52 + ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
  53 + ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id');
  54 + $query = $this->searchParam($query);
  55 + $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
  56 + if(!empty($lists['list'])){
  57 + foreach ($lists['list'] as $k => $v){
  58 + $v = $this->handleParam($v);
  59 + $lists['list'][$k] = $v;
68 } 60 }
69 } 61 }
70 $this->response('success',Code::SUCCESS,$lists); 62 $this->response('success',Code::SUCCESS,$lists);
71 } 63 }
72 64
73 /** 65 /**
74 - * @remark :返回参数过滤  
75 - * @name :returnParamItem 66 + * @remark :type类型
  67 + * @name :searchType
76 * @author :lyh 68 * @author :lyh
77 * @method :post 69 * @method :post
78 - * @time :2023/8/30 11:07 70 + * @time :2023/8/30 10:14
79 */ 71 */
80 - public function handleParam(&$item,&$manageModel,&$domainModel){  
81 - if($item['mysql_id'] != 0 && $item['type'] != 0){  
82 - $data = APublicModel::getNumByProjectId($item['id']); 72 + public function searchType(&$query){
  73 + if(isset($this->map['type'])){
  74 + if($this->map['type'] == Project::TYPE_ZERO){
  75 + $query->where('gl_project.type',Project::TYPE_ZERO);
  76 + }elseif ($this->map['type'] == Project::TYPE_ONE){
  77 + $query->where('gl_project.type',Project::TYPE_ONE);
  78 + }elseif ($this->map['type'] == Project::TYPE_TWO){
  79 + $query->whereIn('gl_project.type', [Project::TYPE_TWO,Project::TYPE_THREE]);
  80 + }else{
  81 + $query->whereIn('gl_project.type', [Project::TYPE_FOUR,Project::TYPE_SIX]);
  82 + }
83 } 83 }
84 - $item = [  
85 - 'id' => $item['id'],  
86 - 'title' => $item['title'],  
87 - 'channel' => Channel::getChannelText($item['channel']['user_id'] ?? 0),  
88 - 'key' => $item['deploy_build']['keyword_num'] ?? 0,  
89 - 'day' => $item['deploy_build']['service_duration'] ?? 0,  
90 - 'amount' => $item['payment']['amount'] ?? 0,  
91 - 'build_leader' => $manageModel->getName($item['deploy_build']['leader_mid']), //组长  
92 - 'build_manager' => $manageModel->getName($item['deploy_build']['manager_mid']), //项目经理  
93 - 'build_designer' => $manageModel->getName($item['deploy_build']['designer_mid']), //设计师  
94 - 'build_tech' => $manageModel->getName($item['deploy_build']['tech_mid']), //技术助理  
95 - 'optimize_manager' => $manageModel->getName($item['deploy_optimize']['manager_mid']), //优化服务经理  
96 - 'optimize_optimist' => $manageModel->getName($item['deploy_optimize']['optimist_mid']), //优化师  
97 - 'optimize_assist' => $manageModel->getName($item['deploy_optimize']['assist_mid']), //优化助理  
98 - 'optimize_tech' => $manageModel->getName($item['deploy_optimize']['tech_mid']), //售后技术  
99 - 'type' => $item['type'],  
100 - 'test_domain' => $item['deploy_build']['test_domain'] ?? 0,  
101 - 'plan' =>Project::planMap()[$item['deploy_build']['plan']],  
102 - 'domain' => !empty($item['deploy_optimize']['domain']) ? $domainModel->getDomain($item['deploy_optimize']['domain']) : '',  
103 - 'created_at' => date('Y年m月d日', strtotime($item['created_at'])),  
104 - 'product_num' => $data['product'] ?? 0,  
105 - 'keyword_num' => $item['deploy_build']['keyword_num'] ?? 0,  
106 - 'article_num' => ($data['blog'] ?? 0) + ($data['news'] ?? 0),  
107 - 'task_finish_num' => Task::getNumByProjectId($item['id'], Task::STATUS_DOWN),  
108 - 'task_pending_num' => Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]),  
109 - 'optimist_status'=>$item['online_check']['optimist_status'] ?? 0,  
110 - 'qa_status'=>$item['online_check']['qa_status'] ?? 0,  
111 - 'service_day'=>$item['remain_day'] ?? 0,  
112 - ];  
113 - return $item; 84 + return $query;
114 } 85 }
115 86
116 /** 87 /**
117 - * @remark :type类型  
118 - * @name :searchType 88 + * @remark :查询字段处理
  89 + * @name :selectParam
119 * @author :lyh 90 * @author :lyh
120 * @method :post 91 * @method :post
121 - * @time :2023/8/30 10:14 92 + * @time :2023/8/18 10:59
122 */ 93 */
123 - public function searchType($type){  
124 - //初始项目  
125 - if($type == Project::TYPE_ZERO){  
126 - $type = Project::TYPE_ZERO;  
127 - }  
128 - //建站中  
129 - if($type == Project::TYPE_ONE){  
130 - $type = Project::TYPE_ONE;  
131 - }  
132 - //建站完成  
133 - if($type == Project::TYPE_TWO){  
134 - $type = ['in',[Project::TYPE_TWO,Project::TYPE_THREE]];  
135 - }  
136 - if($this->param['type'] == Project::TYPE_THREE){  
137 - $type = ['in',[Project::TYPE_FOUR,Project::TYPE_SIX]];  
138 - }  
139 - return $type; 94 + public function selectParam(){
  95 + $select = [
  96 + 'gl_project.id AS id',
  97 + 'gl_project.title AS title',
  98 + 'gl_project.channel AS channel',
  99 + 'gl_project.company AS company',
  100 + 'gl_project.type AS type',
  101 + 'gl_project.created_at AS created_at',
  102 + 'gl_project_online_check.id AS online_check_id',
  103 + 'gl_project_online_check.question AS question',
  104 + 'gl_project_online_check.optimist_status AS optimist_status',
  105 + 'gl_project_online_check.qa_status AS qa_status',
  106 + 'gl_project_payment.amount AS amount',
  107 + 'gl_project_deploy_build.dept_id AS dept_id',
  108 + 'gl_project_deploy_build.keyword_num AS key',
  109 + 'gl_project_deploy_build.service_duration AS day',
  110 + 'gl_project_deploy_build.leader_mid AS leader_mid',
  111 + 'gl_project_deploy_build.manager_mid AS manager_mid',
  112 + 'gl_project_deploy_build.designer_mid AS designer_mid',
  113 + 'gl_project_deploy_build.tech_mid AS tech_mid',
  114 + 'gl_project_deploy_build.test_domain AS test_domain',
  115 + 'gl_project_deploy_build.plan AS plan',
  116 + 'gl_project_deploy_optimize.dept_id AS optimize_dept_id',
  117 + 'gl_project_deploy_optimize.manager_mid AS optimize_manager_mid',
  118 + 'gl_project_deploy_optimize.optimist_mid AS optimize_optimist_mid',
  119 + 'gl_project_deploy_optimize.assist_mid AS optimize_assist_mid',
  120 + 'gl_project_deploy_optimize.tech_mid AS optimize_tech_mid',
  121 + 'gl_project_deploy_optimize.design_mid AS design_mid',
  122 + 'gl_project_deploy_optimize.tech_leader AS tech_leader',
  123 + 'gl_project_deploy_optimize.domain AS domain',
  124 + 'gl_project_deploy_optimize.quality_mid AS quality_mid',
  125 + 'gl_project_deploy_optimize.design_mid AS design_mid',
  126 + 'gl_project_payment.amount AS amount',
  127 + ];
  128 + return $select;
140 } 129 }
141 -  
142 /** 130 /**
143 * @remark :搜索参数处理 131 * @remark :搜索参数处理
144 * @name :searchParam 132 * @name :searchParam
145 * @author :lyh 133 * @author :lyh
146 * @method :post 134 * @method :post
147 - * @time :2023/8/30 10:30 135 + * @time :2023/8/18 10:58
148 */ 136 */
149 - public function searchParam(&$map,$param){ 137 + public function searchParam(&$query){
  138 + //参数type
  139 + $query = $this->searchType($query);
  140 + $query = $this->getManagerRole($query);
  141 + //搜索名称
  142 + if(isset($this->map['title'])){
  143 + $query = $query->orwhere('gl_project.title','like','%'.$this->map['title'].'%');
  144 + }
150 //搜索技术组 145 //搜索技术组
151 - if(!empty($param['dep_id'])){  
152 - $map['id'] = ['in', DeployBuild::where('dept_id', $param['dep_id'])->pluck('project_id')->toArray()]; 146 + if(!empty($this->map['dept_id'])){
  147 + $query = $query->orwhere('gl_project_deploy_build.dept_id',$this->map['dept_id'])
  148 + ->orwhere('gl_project_deploy_optimize.dept_id',$this->map['dept_id']);
153 } 149 }
154 //搜索技术人员 150 //搜索技术人员
155 - if(!empty($param['manage_id'])){  
156 - $map['id'] = ['in', DeployBuild::where('leader_mid', $param['manage_id'])  
157 - ->orwhere('manager_mid', $param['manage_id'])->orwhere('designer_mid', $param['manage_id'])  
158 - ->orwhere('tech_mid', $param['manage_id'])->pluck('project_id')->toArray()];  
159 - } 151 + $query = $this->searchManager($query);
160 //按类型搜索 152 //按类型搜索
161 if(!empty($param['search']) && !empty($param['search_type'])){ 153 if(!empty($param['search']) && !empty($param['search_type'])){
162 - if($this->param['search_type'] == 'domain'){  
163 - //搜索域名  
164 - $map['id'] = ['id', 'in', DeployOptimize::where('domain', 'like', "%{$this->param['search']}%")->pluck('project_id')->toArray()];  
165 - }else{  
166 - $map[$param['search_type']] = ['like', "%{$param['search']}%"];  
167 - } 154 + //搜索域名
  155 + $query = $query->orwhere('gl_project_deploy_optimize.domain','like','%'.$this->map['search'].'%')
  156 + ->orwhere('gl_project.company','like','%'.$this->map['search'].'%')
  157 + ->orwhere('gl_project.title','like','%'.$this->map['search'].'%');
168 } 158 }
169 - return $map; 159 + return $query;
  160 + }
  161 +
  162 + /**
  163 + * @remark :访问权限
  164 + * @name :getManagerRole
  165 + * @author :lyh
  166 + * @method :post
  167 + * @time :2023/9/7 17:28
  168 + */
  169 + public function getManagerRole(&$query){
  170 + if($this->manage['role'] != 1){//1代表查看所有
  171 + //获取当前用户自己的项目
  172 + $query = $query
  173 + ->orwhere('gl_project_deploy_build.leader_mid',$this->manage['id'])
  174 + ->orwhere('gl_project_deploy_build.manager_mid',$this->manage['id'])
  175 + ->orwhere('gl_project_deploy_build.designer_mid',$this->manage['id'])
  176 + ->orwhere('gl_project_deploy_build.tech_mid',$this->manage['id'])
  177 + ->orwhere('gl_project_deploy_optimize.manager_mid',$this->manage['id'])
  178 + ->orwhere('gl_project_deploy_optimize.optimist_mid',$this->manage['id'])
  179 + ->orwhere('gl_project_deploy_optimize.assist_mid',$this->manage['id'])
  180 + ->orwhere('gl_project_deploy_optimize.tech_mid',$this->manage['id'])
  181 + ->orwhere('gl_project_deploy_optimize.tech_leader',$this->manage['id'])
  182 + ->orwhere('gl_project_deploy_optimize.quality_mid',$this->manage['id'])
  183 + ->orwhere('gl_project_deploy_optimize.design_mid',$this->manage['id']);
  184 + //获取用户所在组
  185 + $managerHr = new ManageHr();
  186 + $info = $managerHr->read(['manager_id'=>$this->manage['id']]);
  187 + $query = $query->orwhere('gl_project_deploy_build.dept_id',$info['belong_group'])
  188 + ->orwhere('gl_project_deploy_optimize.dept_id',$info['belong_group']);
  189 + }
  190 + }
  191 +
  192 + /**
  193 + * @remark :搜索技术人员
  194 + * @name :searchManager
  195 + * @author :lyh
  196 + * @method :post
  197 + * @time :2023/9/7 17:16
  198 + */
  199 + public function searchManager(&$query){
  200 + if(!empty($this->map['manage_id'])){
  201 + $query = $query
  202 + ->orwhere('gl_project_deploy_build.leader_mid',$this->map['manage_id'])
  203 + ->orwhere('gl_project_deploy_build.manager_mid',$this->map['manage_id'])
  204 + ->orwhere('gl_project_deploy_build.designer_mid',$this->map['manage_id'])
  205 + ->orwhere('gl_project_deploy_build.tech_mid',$this->map['manage_id'])
  206 + ->orwhere('gl_project_deploy_optimize.manager_mid',$this->map['manage_id'])
  207 + ->orwhere('gl_project_deploy_optimize.optimist_mid',$this->map['manage_id'])
  208 + ->orwhere('gl_project_deploy_optimize.assist_mid',$this->map['manage_id'])
  209 + ->orwhere('gl_project_deploy_optimize.tech_mid',$this->map['manage_id'])
  210 + ->orwhere('gl_project_deploy_optimize.tech_leader',$this->map['manage_id'])
  211 + ->orwhere('gl_project_deploy_optimize.quality_mid',$this->map['manage_id'])
  212 + ->orwhere('gl_project_deploy_optimize.design_mid',$this->map['manage_id']);
  213 + }
  214 + return $query;
  215 + }
  216 +
  217 + /**
  218 + * @remark :参数处理
  219 + * @name :handleParam
  220 + * @author :lyh
  221 + * @method :post
  222 + * @time :2023/8/18 14:44
  223 + */
  224 + public function handleParam(&$item){
  225 + if($item['type'] != Project::TYPE_ZERO){
  226 + $data = APublicModel::getNumByProjectId($item['id']);
  227 + }
  228 + $manageModel = new Manage();
  229 + $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
  230 + $item['build_leader'] = $manageModel->getName($item['leader_mid']);
  231 + $item['build_manager'] = $manageModel->getName($item['manager_mid']);
  232 + $item['build_designer'] = $manageModel->getName($item['designer_mid']);
  233 + $item['build_tech'] = $manageModel->getName($item['tech_mid']);
  234 + $item['optimize_manager'] = $manageModel->getName($item['optimize_manager_mid']);
  235 + $item['optimize_optimist'] = $manageModel->getName($item['optimize_optimist_mid']);
  236 + $item['optimize_assist'] = $manageModel->getName($item['optimize_assist_mid']);
  237 + $item['optimize_tech'] = $manageModel->getName($item['optimize_tech_mid']);
  238 + $item['plan'] = Project::planMap()[$item['plan']];
  239 + $item['created_at'] = date('Y年m月d日', strtotime($item['created_at']));
  240 + $item['autologin_code'] = getAutoLoginCode($item['id']);
  241 + $item['product_num'] = $data['product'] ?? 0;
  242 + $item['autologin_code'] = getAutoLoginCode($item['id']);
  243 + $item['article_num'] = ($data['blog'] ?? 0) + ($data['news'] ?? 0);
  244 + $item['task_finish_num'] = Task::getNumByProjectId($item['id'], Task::STATUS_DOWN);
  245 + $item['task_pending_num'] = Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]);
  246 + return $item;
170 } 247 }
171 248
172 /** 249 /**
@@ -32,7 +32,7 @@ class LoginLogic extends BaseLogic @@ -32,7 +32,7 @@ class LoginLogic extends BaseLogic
32 32
33 public function login() 33 public function login()
34 { 34 {
35 - $manage = $this->model->select('id', 'name', 'password', 'token', 'status', 'gid', 'dept_id') 35 + $manage = $this->model->select('id', 'name', 'password', 'token', 'status', 'gid', 'dept_id','role')
36 ->where('mobile', $this->param['mobile'])->first(); 36 ->where('mobile', $this->param['mobile'])->first();
37 if (!$manage){ 37 if (!$manage){
38 $this->fail('登录用户名不存在'); 38 $this->fail('登录用户名不存在');
@@ -67,11 +67,25 @@ class LoginLogic extends BaseLogic @@ -67,11 +67,25 @@ class LoginLogic extends BaseLogic
67 return $this->success($manage->makeVisible('token')->toArray()); 67 return $this->success($manage->makeVisible('token')->toArray());
68 } 68 }
69 69
  70 + /**
  71 + * @remark :退出登录
  72 + * @name :logout
  73 + * @author :lyh
  74 + * @method :post
  75 + * @time :2023/9/7 16:30
  76 + */
70 public function logout(){ 77 public function logout(){
71 Cache::pull(request()->header('token')); 78 Cache::pull(request()->header('token'));
72 return $this->success(); 79 return $this->success();
73 } 80 }
74 81
  82 + /**
  83 + * @remark :获取登录详情
  84 + * @name :manage
  85 + * @author :lyh
  86 + * @method :post
  87 + * @time :2023/9/7 16:30
  88 + */
75 public static function manage($field = ''){ 89 public static function manage($field = ''){
76 $manage = Cache::get(Common::MANAGE_TOKEN . request()->header('token')); 90 $manage = Cache::get(Common::MANAGE_TOKEN . request()->header('token'));
77 $manage = Manage::find($manage['id'] ?? 0); 91 $manage = Manage::find($manage['id'] ?? 0);
@@ -77,12 +77,12 @@ class CustomTemplateLogic extends BaseLogic @@ -77,12 +77,12 @@ class CustomTemplateLogic extends BaseLogic
77 } 77 }
78 //路由映射 78 //路由映射
79 if(isset($this->param['url']) && !empty($this->param['url'])){ 79 if(isset($this->param['url']) && !empty($this->param['url'])){
80 - RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $id, $this->user['project_id']); 80 + $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $id, $this->user['project_id']);
81 //TODO::通知网站更新 81 //TODO::通知网站更新
82 $data = [ 82 $data = [
83 'project_id'=>$this->user['project_id'], 83 'project_id'=>$this->user['project_id'],
84 'type'=>RouteMap::SOURCE_PAGE, 84 'type'=>RouteMap::SOURCE_PAGE,
85 - 'route'=>$this->param['url'], 85 + 'route'=>$route,
86 ]; 86 ];
87 $this->updateNotify($data); 87 $this->updateNotify($data);
88 } 88 }
@@ -14,6 +14,7 @@ class Manage extends Base @@ -14,6 +14,7 @@ class Manage extends Base
14 const STATUS_ACTIVE = 1; 14 const STATUS_ACTIVE = 1;
15 const STATUS_DISABLE = 0; 15 const STATUS_DISABLE = 0;
16 16
  17 + const ROLE_ZERO = 0;
17 /** 18 /**
18 * 超级管理员ID, 当前ID拥有所有权限, 不能进行修改 19 * 超级管理员ID, 当前ID拥有所有权限, 不能进行修改
19 */ 20 */