作者 lyh

gx

@@ -40,34 +40,36 @@ class Count extends Command @@ -40,34 +40,36 @@ class Count extends Command
40 ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id') 40 ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
41 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 41 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
42 ->select($this->selectParam())->get()->toArray(); 42 ->select($this->selectParam())->get()->toArray();
43 - $data = [];  
44 - $yesterday = Carbon::yesterday()->toDateString();  
45 - foreach ($list as $v){  
46 - $v = (array)$v;  
47 - if($v['domain'] != ''){  
48 - $v['test_domain'] = $v['domain']; 43 + if(!empty($list)){
  44 + $data = [];
  45 + $yesterday = Carbon::yesterday()->toDateString();
  46 + foreach ($list as $v){
  47 + $v = (array)$v;
  48 + if($v['domain'] != ''){
  49 + $v['test_domain'] = $v['domain'];
  50 + }
  51 + $arr = [];
  52 + //统计时间
  53 + $arr['date'] = $yesterday;
  54 + //pv统计
  55 + $arr['pv_num'] = $this->pv_num($yesterday,$v['test_domain']);
  56 + //ip统计
  57 + $arr['ip_num'] = $this->ip_num($yesterday,$v['test_domain']);
  58 + //服务达标天数
  59 + $arr['compliance_day'] = $this->compliance_day($v['test_domain']);
  60 + //剩余服务时常
  61 + $arr['service_day'] = ((int)$v['service_duration'] - (int)$arr['compliance_day']) > 0 ? ((int)$v['service_duration'] - (int)$arr['compliance_day']) : 0;
  62 + //项目id
  63 + $arr['project_id'] = $v['project_id'];
  64 + $arr['created_at'] = date('Y-m-d H:i:s');
  65 + $arr['updated_at'] = date('Y-m-d H:i:s');
  66 + //询盘统计
  67 + $arr = $this->inquiry($arr,$v['test_domain']);
  68 + $data[] = $arr;
49 } 69 }
50 - $arr = [];  
51 - //统计时间  
52 - $arr['date'] = $yesterday;  
53 - //pv统计  
54 - $arr['pv_num'] = $this->pv_num($yesterday,$v['test_domain']);  
55 - //ip统计  
56 - $arr['ip_num'] = $this->ip_num($yesterday,$v['test_domain']);  
57 - //服务达标天数  
58 - $arr['compliance_day'] = $this->compliance_day($v['test_domain']);  
59 - //剩余服务时常  
60 - $arr['service_day'] = ((int)$v['service_duration'] - (int)$arr['compliance_day']) > 0 ? ((int)$v['service_duration'] - (int)$arr['compliance_day']) : 0;  
61 - //项目id  
62 - $arr['project_id'] = $v['project_id'];  
63 - $arr['created_at'] = date('Y-m-d H:i:s');  
64 - $arr['updated_at'] = date('Y-m-d H:i:s');  
65 - //询盘统计  
66 - $arr = $this->inquiry($arr,$v['test_domain']);  
67 - $data[] = $arr; 70 + //判断数据是否存在
  71 + DB::table('gl_count')->insert($data);
68 } 72 }
69 - //判断数据是否存在  
70 - DB::table('gl_count')->insert($data);  
71 echo $this->error; 73 echo $this->error;
72 } 74 }
73 75
@@ -171,7 +171,7 @@ class UserLoginLogic @@ -171,7 +171,7 @@ class UserLoginLogic
171 * @time :2023/8/29 15:26 171 * @time :2023/8/29 15:26
172 */ 172 */
173 public function assembleParam($mobile,$project_id){ 173 public function assembleParam($mobile,$project_id){
174 - $info = $this->model->read(['mobile'=>$mobile,'project_id'=>$project_id],['id','mobile','status','role_id','token','name','project_id']); 174 + $info = $this->model->read(['mobile'=>$mobile,'project_id'=>$project_id],['id','mobile','status','role_id','token','name','wechat','project_id']);
175 //获取项目详情 175 //获取项目详情
176 $project = $this->getProjectInfo($project_id); 176 $project = $this->getProjectInfo($project_id);
177 $info['title'] = $project['title'] ?? ''; 177 $info['title'] = $project['title'] ?? '';