From b79e1c828fd5f88f48340f68647d929bed67044e Mon Sep 17 00:00:00 2001 From: root Date: Thu, 17 Apr 2025 14:11:31 +0800 Subject: [PATCH] add new version --- .../account/priSubsMng/subscriberListDown.php | 29 ++- .../account/pubSubsMng/subscriberListDown.php | 34 +++- .../ppsDailyReport/monthlyReportDown.php | 124 +++++++++++++ .../ppsDailyReport/weeklyReportDown.php | 173 ++++++++++++++++++ wxc2_omc/security/login/login.php | 2 +- 5 files changed, 358 insertions(+), 4 deletions(-) diff --git a/wxc2_omc/account/priSubsMng/subscriberListDown.php b/wxc2_omc/account/priSubsMng/subscriberListDown.php index 51e8d73..26320ae 100755 --- a/wxc2_omc/account/priSubsMng/subscriberListDown.php +++ b/wxc2_omc/account/priSubsMng/subscriberListDown.php @@ -297,6 +297,11 @@ $selKeyValue = $_REQUEST['selKeyValue']; if(strlen($selKeyFieldName) > 0 && strlen($selKeyValue) > 0){ $whereStr = "WHERE $selKeyFieldName like '%$selKeyValue%'"; } + +if(strlen($selKeyFieldName) > 0 && strlen($selKeyValue) > 0 &&$sysTypeNo==330){ + $whereFlag=" and $selKeyFieldName like '%$selKeyValue%'"; +} + if($DEBUG)echo "sysTypeNo=$sysTypeNo,opps_type_sel=$opps_type_sel
"; if($sysTypeNo == 375) { @@ -325,6 +330,7 @@ if(strlen($whereStr) > 10){ //首次查询,查出符合条件的纪录条数,并在以后的页面跳转中传递。 $numberOfRecords = $_REQUEST['numberOfRecords']; +$numberOfFlagRecords = $_REQUEST['numberOfFlagRecords']; if(!$numberOfRecords){ $bgnNo=0; @@ -343,6 +349,21 @@ if(!$numberOfRecords){ $numberOfRecords = $record[0]; if($DEBUG) echo "
numberOfRecords=$numberOfRecords"; //debug_log("/tmp/debug.txt",$numberOfRecords); + + if($sysTypeNo==330){ + $selUsedFlagSql="SELECT count(*) as totalFlag + FROM $tableName + WHERE used_flag = '01' + $whereFlag + $bascWhereStr + "; + if($DEBUG) echo "
selUsedFlagSql=$selUsedFlagSql"; + $flagResult=mysqli_query($pubConn,$selUsedFlagSql); + echo mysqli_error($pubConn); + $flagRecord = @mysqli_fetch_array($flagResult); + $numberOfFlagRecords = $flagRecord[0]; + } + if($numberOfRecords > 0){ //debug_log("/tmp/debug.txt","test2"); //插入日志 @@ -394,6 +415,8 @@ if($numberOfRecords > 0){ } if($sysTypeNo==390) $basePageLink ="sysTypeNo=$sysTypeNo&sysId=$sysId&dataTypeNo=$dataTypeNo&numberOfRecords=$numberOfRecords&orderByField=$orderByField"; + else if($sysTypeNo==330) + $basePageLink ="sysTypeNo=$sysTypeNo&sysId=$sysId&dataTypeNo=$dataTypeNo&numberOfRecords=$numberOfRecords&numberOfFlagRecords=$numberOfFlagRecords"; else $basePageLink ="sysTypeNo=$sysTypeNo&dataTypeNo=$dataTypeNo&numberOfRecords=$numberOfRecords&orderByField=$orderByField"; @@ -441,7 +464,11 @@ echo ""; echo "
"; echo "$strDisplayRecords $showBgnNo - $nextBgnNo, "; -echo "($strTotal:$numberOfRecords)"; +if($sysTypeNo==330){ + echo "($strTotal:$numberOfRecords,UsedFlag:$numberOfFlagRecords)"; +}else{ + echo "($strTotal:$numberOfRecords)"; +} echo ""; // NEW: Display a link for the previous set of records. diff --git a/wxc2_omc/account/pubSubsMng/subscriberListDown.php b/wxc2_omc/account/pubSubsMng/subscriberListDown.php index 81bdb83..94fdcd4 100755 --- a/wxc2_omc/account/pubSubsMng/subscriberListDown.php +++ b/wxc2_omc/account/pubSubsMng/subscriberListDown.php @@ -308,6 +308,9 @@ if(strlen($selKeyFieldName) > 0 && strlen($selKeyValue) > 0){ $whereStr = "WHERE $selKeyFieldName like '%$selKeyValue%'"; } +if(strlen($selKeyFieldName) > 0 && strlen($selKeyValue) > 0 &&$sysType==330){ + $whereFlag=" and $selKeyFieldName like '%$selKeyValue%'"; +} //查询基本条件 if(strlen($whereStr) > 10){ $bascWhereStr =""; @@ -315,6 +318,8 @@ if(strlen($whereStr) > 10){ $bascWhereStr =""; } $numberOfRecords = $_REQUEST['numberOfRecords']; +$numberOfFlagRecords = $_REQUEST['numberOfFlagRecords']; + //首次查询,查出符合条件的纪录条数,并在以后的页面跳转中传递。 if(!$numberOfRecords){ $bgnNo=0; @@ -329,7 +334,22 @@ if(!$numberOfRecords){ $record = @mysqli_fetch_array($result); $numberOfRecords = $record[0]; if($DEBUG) echo "
numberOfRecords=$numberOfRecords"; + + if($sysTypeNo==330){ + $selUsedFlagSql="SELECT count(*) as totalFlag + FROM $tableName + WHERE used_flag = '01' + $whereFlag + $bascWhereStr + "; + if($DEBUG) echo "
selUsedFlagSql=$selUsedFlagSql"; + $flagResult=mysqli_query($pubConn,$selUsedFlagSql); + echo mysqli_error($pubConn); + $flagRecord = @mysqli_fetch_array($flagResult); + $numberOfFlagRecords = $flagRecord[0]; + } + if($numberOfRecords > 0){ //插入日志 insertLog("search $sysTypeName subscriber: $selKeyValue "); @@ -366,7 +386,13 @@ if($numberOfRecords > 0){ if ($prevBgnNo < 0) { $prevBgnNo = 0; } - $basePageLink ="sysTypeNo=$sysTypeNo&sysId=$sysId&dataTypeNo=$dataTypeNo&numberOfRecords=$numberOfRecords"; + if($sysTypeNo==330){ + $basePageLink ="sysTypeNo=$sysTypeNo&sysId=$sysId&dataTypeNo=$dataTypeNo&numberOfRecords=$numberOfRecords&numberOfFlagRecords=$numberOfFlagRecords"; + + }else{ + $basePageLink ="sysTypeNo=$sysTypeNo&sysId=$sysId&dataTypeNo=$dataTypeNo&numberOfRecords=$numberOfRecords"; + + } $basePageLink .="&selKeyFieldName=$selKeyFieldName&selKeyValue=$selKeyValue"; $prePageLink ="bgnNo=$prevBgnNo"; $nextPageLink ="bgnNo=$nextBgnNo"; @@ -398,7 +424,11 @@ function gotoPage(){
 $showBgnNo - $nextBgnNo, "; - echo "($strTotal:$numberOfRecords)"; + if($sysTypeNo==330){ + echo "($strTotal:$numberOfRecords,UsedFlag:$numberOfFlagRecords)"; + }else{ + echo "($strTotal:$numberOfRecords)"; + } ?>   diff --git a/wxc2_omc/performance/ppsDailyReport/monthlyReportDown.php b/wxc2_omc/performance/ppsDailyReport/monthlyReportDown.php index 9729845..3cf874e 100755 --- a/wxc2_omc/performance/ppsDailyReport/monthlyReportDown.php +++ b/wxc2_omc/performance/ppsDailyReport/monthlyReportDown.php @@ -262,6 +262,9 @@ $thisMonthTotalMMSRetrieveCharged=0; $thisMonthTotalMMSEmailNumber=0; $thisMonthTotalMMSEmailCharged=0; + +$allUssdCodes = []; // 用于存储所有记录的 ussd_code + do{ //Account summary if ($lastMonthBalance==0) @@ -379,6 +382,54 @@ do{ $thisMonthTotalMMSEmailNumber+=$selRow[mms_email_number]; $thisMonthTotalMMSEmailCharged+=$selRow[mms_email_charged]; + + if(!count($allUssdCodes)){ // 代表是第一条记录 + // 初始化数组 + for ($i = 1; $i <= 8; $i++) { + $allUssdCodes[$i] = $selRow['ussd_code_' . $i]; + $thisMonthTotalSessionNum[$i] = $selRow['session_num_' . $i]; + $thisMonthTotalSessionDuration[$i] = $selRow['session_duration_'. $i]; + $thisMonthTotalErrorTimeout[$i] = $selRow['error_timeout_'. $i]; + $thisMonthTotalErrorSystem[$i] = $selRow['error_system_'. $i]; + $thisMonthTotalErrorMessage[$i] = $selRow['error_message_'. $i]; + } + } else { // 剩余记录 + // 创建USSD索引的映射 + $codeToIndexMap = array_flip(array_filter($allUssdCodes)); + + for ($j = 1; $j <= 8; $j++) { + $currentCode = $selRow['ussd_code_' . $j]; + if (!$currentCode) continue; // 跳过空代码 + + if (isset($codeToIndexMap[$currentCode])) { + // 已存在的代码,累加统计数据 + $index = $codeToIndexMap[$currentCode]; + $thisMonthTotalSessionNum[$index] += $selRow['session_num_' . $j]; + $thisMonthTotalSessionDuration[$index] += $selRow['session_duration_'. $j]; + $thisMonthTotalErrorTimeout[$index] += $selRow['error_timeout_'. $j]; + $thisMonthTotalErrorSystem[$index] += $selRow['error_system_'. $j]; + $thisMonthTotalErrorMessage[$index] += $selRow['error_message_'. $j]; + } else { + //找一个空位存放 + foreach ($allUssdCodes as $key => $value) { + if (!$value) { + $allUssdCodes[$key] = $currentCode; + $codeToIndexMap[$currentCode] = $key; + $thisMonthTotalSessionNum[$key] = $selRow['session_num_' . $j]; + $thisMonthTotalSessionDuration[$key] = $selRow['session_duration_'. $j]; + $thisMonthTotalErrorTimeout[$key] = $selRow['error_timeout_'. $j]; + $thisMonthTotalErrorSystem[$key] = $selRow['error_system_'. $j]; + $thisMonthTotalErrorMessage[$key] = $selRow['error_message_'. $j]; + break; + } + } + } + } + } + + + + }while($selRow=mysqli_fetch_array($selRes)); $thisMonthTotalGPRSVolume=number_format($thisMonthTotalGPRSVolume,3,'.',''); @@ -735,6 +786,79 @@ for($i=1;$i<=12;$i++){
+ + + +

+ + +  "; + echo ""; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + + ?> + + + + 1"; + // $thisMonthTotalSessionNum[$i]+=$selRow['session_num_' . $i]; + // $thisMonthTotalSessionDuration[$i]+=$selRow['session_duration_'. $i]; + // $thisMonthTotalErrorTimeout[$i]+=$selRow['error_timeout_'. $i]; + // $thisMonthTotalErrorSystem[$i]+=$selRow['error_system_'. $i]; + // $thisMonthTotalErrorMessage[$i]+=$selRow['error_message_'. $i]; + // $thisMonthTotalErrorReserve1[$i]+=$selRow['error_reserve_1_'. $i]; + // $thisMonthTotalErrorReserve2[$i]+=$selRow['error_reserve_2_'. $i]; + $average1 = $thisMonthTotalSessionNum[1] ? round($thisMonthTotalSessionDuration[1]/($thisMonthTotalSessionNum[1]), 2) : 0; + $tps1 = round($thisMonthTotalSessionNum[1]/(3600*24), 2); + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + + + // echo ""; + // echo ""; + // echo ""; + ?> + + "; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + } + ?> +
IndexUSSD CodeSession NumSession DurationError TimeoutError SystemError MessageAverage DurationTPS
$allUssdCodes[1]$thisMonthTotalSessionNum[1]$thisMonthTotalSessionDuration[1]$thisMonthTotalErrorTimeout[1]$thisMonthTotalErrorSystem[1]$thisMonthTotalErrorMessage[1]$average1$tps1$incoming_call_nums$incoming_call_duration$incoming_call_charge
$i{$allUssdCodes[$i]}{$thisMonthTotalSessionNum[$i]}{$thisMonthTotalSessionDuration[$i]}{$thisMonthTotalErrorTimeout[$i]}{$thisMonthTotalErrorSystem[$i]}{$thisMonthTotalErrorMessage[$i]}{$average}{$tps}
+ + + + +

"; diff --git a/wxc2_omc/performance/ppsDailyReport/weeklyReportDown.php b/wxc2_omc/performance/ppsDailyReport/weeklyReportDown.php index 255a1ff..6615ecf 100755 --- a/wxc2_omc/performance/ppsDailyReport/weeklyReportDown.php +++ b/wxc2_omc/performance/ppsDailyReport/weeklyReportDown.php @@ -330,6 +330,9 @@ $thisWeekTotalMMSRetrieveCharged=0; $thisWeekTotalMMSEmailNumber=0; $thisWeekTotalMMSEmailCharged=0; + +$allUssdCodes = []; // 用于存储所有记录的 ussd_code + do{ //Account summary if($lastWeekBalance == 0){ @@ -447,7 +450,107 @@ do{ $thisWeekTotalMMSRetrieveCharged+=$selRow[mms_retrieve_charged]; $thisWeekTotalMMSEmailNumber+=$selRow[mms_email_number]; $thisWeekTotalMMSEmailCharged+=$selRow[mms_email_charged]; + + + + // for ($i = 1; $i <= 8; $i++) { + // //$average = $array['session_num_' . $i] ? round($array['session_duration_' . $i]/$array['session_num_' . $i], 2) : 0; + // //$tps = round($array['session_num_' . $i]/(3600*24), 2); + // $thisWeekTotalSessionNum[$i]+=$selRow['session_num_' . $i]; + // $thisWeekTotalSessionDuration[$i]+=$selRow['session_duration_'. $i]; + // $thisWeekTotalErrorTimeout[$i]+=$selRow['error_timeout_'. $i]; + // $thisWeekTotalErrorSystem[$i]+=$selRow['error_system_'. $i]; + // $thisWeekTotalErrorMessage[$i]+=$selRow['error_message_'. $i]; + // $thisWeekTotalErrorReserve1[$i]+=$selRow['error_reserve_1_'. $i]; + // $thisWeekTotalErrorReserve2[$i]+=$selRow['error_reserve_2_'. $i]; + + + + // } + // if(!count($allUssdCodes)){ //代表是第一条记录 + // //echo $selRow['ussd_code_1']; + // for ($i = 1; $i <= 8; $i++) { + // $allUssdCodes[$i] = $selRow['ussd_code_' . $i]; + // $thisWeekTotalSessionNum[$i]+=$selRow['session_num_' . $i]; + // $thisWeekTotalSessionDuration[$i]+=$selRow['session_duration_'. $i]; + // $thisWeekTotalErrorTimeout[$i]+=$selRow['error_timeout_'. $i]; + // $thisWeekTotalErrorSystem[$i]+=$selRow['error_system_'. $i]; + // $thisWeekTotalErrorMessage[$i]+=$selRow['error_message_'. $i]; + // } + // //echo $selRow['ussd_code_2']; + + // }else{//剩余记录 + // foreach ($allUssdCodes as $key => $value) { + // if(!$value){ //空则要把现在的值补充进去 + // $allUssdCodes[$key] = $selRow['ussd_code_' . $key]; + // $thisWeekTotalSessionNum[$key]+=$selRow['session_num_' . $key]; + // $thisWeekTotalSessionDuration[$key]+=$selRow['session_duration_'. $key]; + // $thisWeekTotalErrorTimeout[$key]+=$selRow['error_timeout_'. $key]; + // $thisWeekTotalErrorSystem[$key]+=$selRow['error_system_'. $key]; + // $thisWeekTotalErrorMessage[$key]+=$selRow['error_message_'.$key]; + // }else{//不空则开始比较 + // for ($j = 1; $j <= 8; $j++) {//当前allUssdCodes[key]与当前记录全部进行比较 + // if($allUssdCodes[$key] == $selRow['ussd_code_' . $j]){ + // $thisWeekTotalSessionNum[$key]+=$selRow['session_num_' . $key]; + // $thisWeekTotalSessionDuration[$key]+=$selRow['session_duration_'. $key]; + // $thisWeekTotalErrorTimeout[$key]+=$selRow['error_timeout_'. $key]; + // $thisWeekTotalErrorSystem[$key]+=$selRow['error_system_'. $key]; + // $thisWeekTotalErrorMessage[$key]+=$selRow['error_message_'.$key]; + // break; + // } + // } + // } + // //echo "key=$key, value=$value
"; + // } + + // } + + + if(!count($allUssdCodes)){ // 代表是第一条记录 + // 初始化数组 + for ($i = 1; $i <= 8; $i++) { + $allUssdCodes[$i] = $selRow['ussd_code_' . $i]; + $thisWeekTotalSessionNum[$i] = $selRow['session_num_' . $i]; + $thisWeekTotalSessionDuration[$i] = $selRow['session_duration_'. $i]; + $thisWeekTotalErrorTimeout[$i] = $selRow['error_timeout_'. $i]; + $thisWeekTotalErrorSystem[$i] = $selRow['error_system_'. $i]; + $thisWeekTotalErrorMessage[$i] = $selRow['error_message_'. $i]; + } + } else { // 剩余记录 + // 创建USSD索引的映射 + $codeToIndexMap = array_flip(array_filter($allUssdCodes)); + + for ($j = 1; $j <= 8; $j++) { + $currentCode = $selRow['ussd_code_' . $j]; + if (!$currentCode) continue; // 跳过空代码 + + if (isset($codeToIndexMap[$currentCode])) { + // 已存在的代码,累加统计数据 + $index = $codeToIndexMap[$currentCode]; + $thisWeekTotalSessionNum[$index] += $selRow['session_num_' . $j]; + $thisWeekTotalSessionDuration[$index] += $selRow['session_duration_'. $j]; + $thisWeekTotalErrorTimeout[$index] += $selRow['error_timeout_'. $j]; + $thisWeekTotalErrorSystem[$index] += $selRow['error_system_'. $j]; + $thisWeekTotalErrorMessage[$index] += $selRow['error_message_'. $j]; + } else { + //找一个空位存放 + foreach ($allUssdCodes as $key => $value) { + if (!$value) { + $allUssdCodes[$key] = $currentCode; + $codeToIndexMap[$currentCode] = $key; + $thisWeekTotalSessionNum[$key] = $selRow['session_num_' . $j]; + $thisWeekTotalSessionDuration[$key] = $selRow['session_duration_'. $j]; + $thisWeekTotalErrorTimeout[$key] = $selRow['error_timeout_'. $j]; + $thisWeekTotalErrorSystem[$key] = $selRow['error_system_'. $j]; + $thisWeekTotalErrorMessage[$key] = $selRow['error_message_'. $j]; + break; + } + } + } + } + } + }while($selRow=mysqli_fetch_array($selRes)); $thisWeekTotalGPRSVolume=number_format($thisWeekTotalGPRSVolume,3,'.',''); @@ -863,7 +966,77 @@ echo ""; ?> + +

+ + +  "; + echo ""; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + + ?> + + + + 1"; + // $thisWeekTotalSessionNum[$i]+=$selRow['session_num_' . $i]; + // $thisWeekTotalSessionDuration[$i]+=$selRow['session_duration_'. $i]; + // $thisWeekTotalErrorTimeout[$i]+=$selRow['error_timeout_'. $i]; + // $thisWeekTotalErrorSystem[$i]+=$selRow['error_system_'. $i]; + // $thisWeekTotalErrorMessage[$i]+=$selRow['error_message_'. $i]; + // $thisWeekTotalErrorReserve1[$i]+=$selRow['error_reserve_1_'. $i]; + // $thisWeekTotalErrorReserve2[$i]+=$selRow['error_reserve_2_'. $i]; + $average1 = $thisWeekTotalSessionNum[1] ? round($thisWeekTotalSessionDuration[1]/($thisWeekTotalSessionNum[1]), 2) : 0; + $tps1 = round($thisWeekTotalSessionNum[1]/(3600*24), 2); + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + + + // echo ""; + // echo ""; + // echo ""; + ?> + + "; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + } + ?> +
IndexUSSD CodeSession NumSession DurationError TimeoutError SystemError MessageAverage DurationTPS
$allUssdCodes[1]$thisWeekTotalSessionNum[1]$thisWeekTotalSessionDuration[1]$thisWeekTotalErrorTimeout[1]$thisWeekTotalErrorSystem[1]$thisWeekTotalErrorMessage[1]$average1$tps1$incoming_call_nums$incoming_call_duration$incoming_call_charge
$i{$allUssdCodes[$i]}{$thisWeekTotalSessionNum[$i]}{$thisWeekTotalSessionDuration[$i]}{$thisWeekTotalErrorTimeout[$i]}{$thisWeekTotalErrorSystem[$i]}{$thisWeekTotalErrorMessage[$i]}{$average}{$tps}
+ + +

+ "; echo ""; diff --git a/wxc2_omc/security/login/login.php b/wxc2_omc/security/login/login.php index b2efe2b..86aa036 100755 --- a/wxc2_omc/security/login/login.php +++ b/wxc2_omc/security/login/login.php @@ -227,7 +227,7 @@ function selectChn(){ } ?> -R2503.1 +R2503.2