周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 5a7b2f755548c6254a7e3883dc26aba38cba0e99 1 个父辈 12ef0f70

gx心跳数据

内嵌 并排对比
正在显示 1 个修改的文件 包含 3 行增加 和 4 行删除
@@ -25,22 +25,23 @@ class OperationHeartbeatController extends BaseController @@ -25,22 +25,23 @@ class OperationHeartbeatController extends BaseController
25 public function saveHeartbeat(){ 25 public function saveHeartbeat(){
26 $this->request->validate([ 26 $this->request->validate([
27 'source'=>'required', 27 'source'=>'required',
  28 + 'source_id'=>'required',
28 'is_list' => 'required', 29 'is_list' => 'required',
29 'is_custom'=>'required', 30 'is_custom'=>'required',
30 'is_template'=>'required', 31 'is_template'=>'required',
31 - 'operator_id'=>'required',  
32 ], [ 32 ], [
33 'source.required' => '请选择页面', 33 'source.required' => '请选择页面',
  34 + 'source_id.required' => '请选择数据id',
34 'is_list.required' => '列表页/详情页', 35 'is_list.required' => '列表页/详情页',
35 'is_custom.required' => '是否为扩展模版', 36 'is_custom.required' => '是否为扩展模版',
36 'is_template.required' => '详情页/可视化', 37 'is_template.required' => '详情页/可视化',
37 - 'operator_id.required' => '操作人',  
38 ]); 38 ]);
39 $condition = ['project_id'=>$this->user['project_id'],'source'=>$this->param['source'],'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']]; 39 $condition = ['project_id'=>$this->user['project_id'],'source'=>$this->param['source'],'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']];
40 $operationHeartbeatModel = new OperationHeartbeat(); 40 $operationHeartbeatModel = new OperationHeartbeat();
41 $info = $operationHeartbeatModel->read($condition,['id','status']); 41 $info = $operationHeartbeatModel->read($condition,['id','status']);
42 $condition['status'] = $condition['status'] ?? 0; 42 $condition['status'] = $condition['status'] ?? 0;
43 if($info === false){ 43 if($info === false){
  44 + $condition['operator_id'] = $this->user['id'];
44 $condition['project_id'] = $this->user['project_id']; 45 $condition['project_id'] = $this->user['project_id'];
45 $operationHeartbeatModel->addReturnId($condition); 46 $operationHeartbeatModel->addReturnId($condition);
46 }else{ 47 }else{
@@ -62,13 +63,11 @@ class OperationHeartbeatController extends BaseController @@ -62,13 +63,11 @@ class OperationHeartbeatController extends BaseController
62 'is_list' => 'required', 63 'is_list' => 'required',
63 'is_custom'=>'required', 64 'is_custom'=>'required',
64 'is_template'=>'required', 65 'is_template'=>'required',
65 - 'operator_id'=>'required',  
66 ], [ 66 ], [
67 'source.required' => '请选择页面', 67 'source.required' => '请选择页面',
68 'is_list.required' => '列表页/详情页', 68 'is_list.required' => '列表页/详情页',
69 'is_custom.required' => '是否为扩展模版', 69 'is_custom.required' => '是否为扩展模版',
70 'is_template.required' => '详情页/可视化', 70 'is_template.required' => '详情页/可视化',
71 - 'operator_id.required' => '操作人',  
72 ]); 71 ]);
73 $condition = ['project_id'=>$this->user['project_id'],'source'=>$this->param['source'], 72 $condition = ['project_id'=>$this->user['project_id'],'source'=>$this->param['source'],
74 'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']]; 73 'is_list'=>$this->param['is_list'],'is_custom'=>$this->param['is_custom'],'is_template'=>$this->param['is_template']];