diff --git a/application/app/controller/Base.php b/application/app/controller/Base.php index e73c121..2c03f06 100644 --- a/application/app/controller/Base.php +++ b/application/app/controller/Base.php @@ -17,7 +17,7 @@ class Base extends Controller{ '10002'=>'操作失败', '10003'=>'信息核实错误', '10004'=>'未找到有效数据', - '10005'=>'未核实到数据', + '10005'=>'参数错误', '10006'=>'未核实到数据', '10007'=>'未核实到数据', '10008'=>'未核实到数据', @@ -42,7 +42,7 @@ class Base extends Controller{ } // 检查变量是否是一个只有数字的一维数组 - public function is_num_array($array = [1,2,3]) { + public function is_num_array($array = [1,2,3],$type=1) { if (!is_array($array)) { return false; // 变量不是数组 } @@ -51,6 +51,9 @@ class Base extends Controller{ return false; // 数组中包含非数字元素 } } + if($type!=1){ + return true; + } // $result = Db::table('app_card_data')->where(['is_del'=>1])->cache(true,3600)->column('id');//查询结果缓存3600秒 $result = Db::table('app_card_data')->where(['is_del'=>0])->cache(true,3600)->select();//查询结果缓存3600秒 // dump($result); diff --git a/application/app/controller/Card.php b/application/app/controller/Card.php index c1cb8c1..640519e 100644 --- a/application/app/controller/Card.php +++ b/application/app/controller/Card.php @@ -143,7 +143,7 @@ class Card extends Base{ } // 获取记录信息列表 - public function get_card_record_data($data = ['aud_id'=>'11','s_time'=>'2024-04-01 10:10:10','e_time'=>'2024-06-12 10:10:10','token'=>'0dafb98a10995c98b5a33b7d59d986ca']){ + public function get_card_record_data($data = ['aud_id'=>'25','s_time'=>'2024-04-01 10:10:10','e_time'=>'2024-06-12 10:10:10','token'=>'0dafb98a10995c98b5a33b7d59d986ca']){ if(count(input('post.')) > 0){ $data = input('post.'); } @@ -180,23 +180,21 @@ class Card extends Base{ } // 数据对比 - public function card_data_contrast($data = ['acd_id'=>'2','aud_id'=>'11','s_time'=>'2024-04-01 10:10:10','e_time'=>'2024-04-12 10:10:10']){ + public function card_data_contrast($data = ['id_arr'=>'24,25','token'=>'0dafb98a10995c98b5a33b7d59d986ca']){ if(count(input('post.')) > 0){ $data = input('post.'); } - if(!array_key_exists('acd_id', $data) || !array_key_exists('aud_id', $data) || !array_key_exists('s_time', $data) || !array_key_exists('e_time', $data)){ + if(!array_key_exists('id_arr', $data) || !array_key_exists('token', $data)){ return $this->msg(10001); } if($this->token_time_validate($data['token']) === false){ return $this->msg(20001); } unset($data['token']); - - if($data['acd_id'] == '2'){ - return $this->body_data_contrast($data); - }else if($data['acd_id'] == '6'){ - - } + // $data = explode(',',$data['id_arr']); + // dump($data); + // die; + return $this->body_data_contrast($data); } ################################################################业务接口################################################################ ################################################################业务接口################################################################ @@ -579,8 +577,11 @@ class Card extends Base{ // 身体数据对比 - public function body_data_contrast($data = ['acd_id'=>'2','data'=>[1,10]]){ - $between_num = implode(',',$data['data']); + public function body_data_contrast($data){ + + $data2 = explode(',',$data['id_arr']); + // dump($data2); + // die; $calculate_arr = []; $result = Db::query(" select @@ -596,12 +597,12 @@ class Card extends Base{ aud.birthday from app_card_body_data as acbd left join app_user_data as aud on acbd.aud_id=aud.id - where acbd.id in (".$between_num.") + where acbd.id in (".$data['id_arr'].") "); if(!$result || count($result)<2){ - return $this->msg(10003); + return $this->msg(10004); } - foreach ($data['data'] as $key => $value) { + foreach ($data2 as $key => $value) { foreach ($result as $k => $v) { if($value == $v['id']){ array_push($calculate_arr, $v); @@ -609,6 +610,7 @@ class Card extends Base{ } } + $return_data['nickname'] = $calculate_arr[0]['nickname']; if($calculate_arr[0]['gender']==1){ $return_data['gender'] = '男'; @@ -620,12 +622,12 @@ class Card extends Base{ // bcsub(,,20) $return_data['age'] = $this->calculate_age($calculate_arr[0]['birthday']); $return_data['time'] = $this->daysSince($calculate_arr[0]['record_time'],$calculate_arr[1]['record_time']); - $return_data['weight_loss'] = bcsub($calculate_arr[1]['weight'],$calculate_arr[0]['weight'],1); - $return_data['reduce_fat'] = bcsub(explode(',',$calculate_arr[1]['fat_w'])[0],explode(',',$calculate_arr[0]['fat_w'])[0],2); + $return_data['weight_loss'] = bcsub($calculate_arr[0]['weight'],$calculate_arr[1]['weight'],1); + $return_data['reduce_fat'] = bcsub(explode(',',$calculate_arr[0]['fat_w'])[0],explode(',',$calculate_arr[1]['fat_w'])[0],2); $return_data['between_time'] = $calculate_arr[0]['b_time'].'-'.$calculate_arr[1]['b_time']; - $return_data['execl_data']['height'] = ['身高',bcsub($calculate_arr[1]['height'],$calculate_arr[0]['height'],1),$calculate_arr[0]['height'],$calculate_arr[1]['height']]; - $return_data['execl_data']['weight'] = ['体重',bcsub($calculate_arr[1]['weight'],$calculate_arr[0]['weight'],1),$calculate_arr[0]['weight'],$calculate_arr[1]['weight']]; - $return_data['execl_data']['bmi'] = ['BMI',bcsub($calculate_arr[1]['bmi'],$calculate_arr[0]['bmi'],1),$calculate_arr[0]['bmi'],$calculate_arr[1]['bmi']]; + $return_data['execl_data']['height'] = ['身高',bcsub($calculate_arr[0]['height'],$calculate_arr[1]['height'],1),$calculate_arr[0]['height'],$calculate_arr[1]['height']]; + $return_data['execl_data']['weight'] = ['体重',bcsub($calculate_arr[0]['weight'],$calculate_arr[1]['weight'],1),$calculate_arr[0]['weight'],$calculate_arr[1]['weight']]; + $return_data['execl_data']['bmi'] = ['BMI',bcsub($calculate_arr[0]['bmi'],$calculate_arr[1]['bmi'],1),$calculate_arr[0]['bmi'],$calculate_arr[1]['bmi']]; // dump($return_data); // die; return $this->msg($return_data); diff --git a/application/route.php b/application/route.php index b1f4996..dfbca53 100644 --- a/application/route.php +++ b/application/route.php @@ -76,6 +76,9 @@ Route::any('/card_del_record_data', 'app/card/card_del_record_data'); Route::any('/card_curve_chart', 'app/card/card_curve_chart'); // 曲线页面底部目标 Route::any('/card_curve_target', 'app/card/card_curve_target'); +// 数据对比 +Route::any('/card_data_contrast', 'app/card/card_data_contrast'); + // ################################跳绳接口################################ // 查找设备 Route::any('/skip_device_check', 'app/skip/skip_device_check');