diff --git a/Laravel/app/Http/Controllers/API/PEISApiController.php b/Laravel/app/Http/Controllers/API/PEISApiController.php index 5ea643c..a20c015 100644 --- a/Laravel/app/Http/Controllers/API/PEISApiController.php +++ b/Laravel/app/Http/Controllers/API/PEISApiController.php @@ -15,22 +15,52 @@ class PEISApiController extends Controller public static function Api($url_code, $code) { - $url = 'https://dqgatjzx-wx.sixinyun.com'; - $api['套餐详情查询'] = "{$url}/PEISCommon/QueryComboDetail/{$code}"; - $api['自选项目查询'] = "{$url}/PEISCommon/QueryGroups/{$code}"; - $api['套餐查询'] = "{$url}/PEISCommon/QueryCombos/{$code}"; - $api['套餐项目检查'] = "{$url}/PEISCommon/CheckComboAndGroup/{$code}"; - $api['个检预约'] = "{$url}/PEISCommon/PersonAppointment/{$code}"; - $api['个检预约查询'] = "{$url}/PEISCommon/QueryPersonAppointment/{$code}"; - $api['个检预约取消'] = "{$url}/PEISCommon/CancelPersonAppointment/{$code}"; - $api['团检登记查询'] = "{$url}/PEISCommon/QueryUnitAppointmentReg/{$code}"; - $api['团检预约'] = "{$url}/PEISCommon/UnitAppointment/{$code}"; - $api['团检预约查询'] = "{$url}/PEISCommon/QueryUnitAppointment/{$code}"; - $api['团检预约取消'] = "{$url}/PEISCommon/CancelUnitAppointment/{$code}"; - $api['体检报告查询'] = "{$url}/PEISCommon/QueryExamReport/{$code}"; - $api['预约时段修改'] = "{$url}/PEISCommon/ModifyAppointmentDTRange/{$code}"; - $api['修改用户预约时间'] = "http://220.174.210.111:8888/ExtAPI/SetAppointmentMoment?key=YmMxOGI2MDUxZmFh&{$code}"; - $api['分诊查询体检号'] = "{$url}/PEISCommon/QueryEventNo/{$code}"; + //正式 + $env=config('app.globals.Env'); + if($env=='pro') { //如果是正式环境 + //思信测试环境,H5正式环境 + $url = 'http://220.174.210.111:8899'; + $api['套餐详情查询'] = "{$url}/PEISCommon/QueryComboDetail?key=YmMxOGI2MDUxZmFh"; + $api['自选项目查询'] = "{$url}/PEISCommon/QueryGroups?key=YmMxOGI2MDUxZmFh"; + $api['套餐查询'] = "{$url}/PEISCommon/QueryCombos?key=YmMxOGI2MDUxZmFh"; + $api['套餐项目检查'] = "{$url}/PEISCommon/CheckComboAndGroup?key=YmMxOGI2MDUxZmFh"; + $api['个检预约'] = "{$url}/PEISCommon/PersonAppointment?key=YmMxOGI2MDUxZmFh"; + $api['个检预约查询'] = "{$url}/PEISCommon/QueryPersonAppointment?key=YmMxOGI2MDUxZmFh"; + $api['个检预约取消'] = "{$url}/PEISCommon/CancelPersonAppointment?key=YmMxOGI2MDUxZmFh"; + $api['团检登记查询'] = "{$url}/PEISCommon/QueryUnitAppointmentReg?key=YmMxOGI2MDUxZmFh"; + $api['团检预约'] = "{$url}/PEISCommon/UnitAppointment?key=YmMxOGI2MDUxZmFh"; + $api['团检预约查询'] = "{$url}/PEISCommon/QueryUnitAppointment?key=YmMxOGI2MDUxZmFh"; + $api['团检预约取消'] = "{$url}/PEISCommon/CancelUnitAppointment?key=YmMxOGI2MDUxZmFh"; + $api['体检报告查询'] = "{$url}/PEISCommon/QueryExamReport?key=YmMxOGI2MDUxZmFh"; + $api['预约时段修改'] = "{$url}/PEISCommon/ModifyAppointmentDTRange?key=YmMxOGI2MDUxZmFh"; + $api['修改用户预约时间'] = "{$url}/ExtAPI/SetAppointmentMoment?key=YmMxOGI2MDUxZmFh&{$code}"; + $api['分诊查询体检号'] = "{$url}/PEISCommon/QueryEventNo?key=YmMxOGI2MDUxZmFh"; + $api['报告时间计算'] = "{$url}/Home/CalcReportDays?eventNo={$code}"; + + } + if($env=='dev') { //如果是测试环境 + $url = 'https://dqgatjzx-wx.sixinyun.com'; + $api['套餐详情查询'] = "{$url}/PEISCommon/QueryComboDetail/{$code}"; + $api['自选项目查询'] = "{$url}/PEISCommon/QueryGroups/{$code}"; + $api['套餐查询'] = "{$url}/PEISCommon/QueryCombos/{$code}"; + $api['套餐项目检查'] = "{$url}/PEISCommon/CheckComboAndGroup/{$code}"; + $api['个检预约'] = "{$url}/PEISCommon/PersonAppointment/{$code}"; + $api['个检预约查询'] = "{$url}/PEISCommon/QueryPersonAppointment/{$code}"; + $api['个检预约取消'] = "{$url}/PEISCommon/CancelPersonAppointment/{$code}"; + $api['团检登记查询'] = "{$url}/PEISCommon/QueryUnitAppointmentReg/{$code}"; + $api['团检预约'] = "{$url}/PEISCommon/UnitAppointment/{$code}"; + $api['团检预约查询'] = "{$url}/PEISCommon/QueryUnitAppointment/{$code}"; + $api['团检预约取消'] = "{$url}/PEISCommon/CancelUnitAppointment/{$code}"; + $api['体检报告查询'] = "{$url}/PEISCommon/QueryExamReport/{$code}"; + $api['预约时段修改'] = "{$url}/PEISCommon/ModifyAppointmentDTRange/{$code}"; + $api['修改用户预约时间'] = "http://220.174.210.111:8888/ExtAPI/SetAppointmentMoment?key=YmMxOGI2MDUxZmFh&{$code}"; + $api['分诊查询体检号'] = "{$url}/PEISCommon/QueryEventNo/{$code}"; + + } + + + + return $api["{$url_code}"] ?? $url_code; } @@ -64,11 +94,7 @@ class PEISApiController extends Controller if (!json_decode($res_string, true)) { - return \Yz::Return(false, '获取失败', [ - 'url' => $url, - 'data' => $data, - 'res' => $res_string - ]); + throw new HttpResponseException( \Yz::echoError1("体检系统提示:".$res_string)); } $res = json_decode($res_string, true); if ($res['ResultCode'] != 0){ diff --git a/Laravel/app/Http/Controllers/TestController.php b/Laravel/app/Http/Controllers/TestController.php index d37b012..061a56b 100644 --- a/Laravel/app/Http/Controllers/TestController.php +++ b/Laravel/app/Http/Controllers/TestController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Http\Controllers\API\AspNetZhuanController; +use App\Http\Controllers\API\PEISApiController; use App\Services\OrderService; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -13,18 +14,23 @@ class TestController extends Controller echo DB::table('users')->count(); //$order= new OrderService(); // dd($order->DepartmentItemCount(33)); - $aspnet=new AspNetZhuanController(); - $temp_list=[]; - $nmr=$aspnet::GetNmrList(['yyid'=>6,'data'=>['2024-10-25']],uniqid()); - - //获取每日数量 - foreach($nmr as $k=>$v){ - $temp_list[]=[ - 'date'=>$k, - 'count'=>count($v) - ]; - } - dd($temp_list); + + +// $aspnet=new AspNetZhuanController(); +// $temp_list=[]; +// $nmr=$aspnet::GetNmrList(['yyid'=>6,'data'=>['2024-10-25']],uniqid()); +// +// //获取每日数量 +// foreach($nmr as $k=>$v){ +// $temp_list[]=[ +// 'date'=>$k, +// 'count'=>count($v) +// ]; +// } + + $peis = new PEISApiController(); + dd($peis::Post2("报告时间计算",$peis::Api('修改用户预约时间',"2342344"),1,[])); + } public function ApiTest(){