From 801b9f5f362697e126d3e50f46fe678d9a5e2ec5 Mon Sep 17 00:00:00 2001
From: lai <10633968+laiyujun1@user.noreply.gitee.com>
Date: Tue, 17 Dec 2024 17:16:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0SGSN-CDR=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wxc2_omc/account/cdrList/cdrDown.php   | 42 ++++++++++++++++++++++++--
 wxc2_omc/account/cdrList/cdrHeader.php | 15 ++++++---
 wxc2_omc/account/cdrList/cdrUp.php     |  8 +++--
 3 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/wxc2_omc/account/cdrList/cdrDown.php b/wxc2_omc/account/cdrList/cdrDown.php
index 9754018..fa7b6d5 100755
--- a/wxc2_omc/account/cdrList/cdrDown.php
+++ b/wxc2_omc/account/cdrList/cdrDown.php
@@ -189,6 +189,10 @@ case '360':	//PPS
 case '375':
 	$showNameList="Operation Type,IMEI,MSISDN,IMSI,User Type,Seizure,Result";
 
+	break;
+case '400':
+	$showNameList="Operation Type,IMSI,GPRS Uplink,GPRS Downlink,Access Point NameOI,Duration";
+
 	break;
 default:
 	break;
@@ -245,15 +249,21 @@ while(($dispNum<$dispNumOfPerPage)&&($cntTbNum_1<24)){
 		$typeFld = " $typeTb.description_2 ";
 		$srcFld = " $srcTb.description_2 ";
 	}
+	
+	if($sysId==400){
+		$order  = " ORDER BY recordOpeningTime DESC";
+
+	}else{
+		$order  = " ORDER BY $sortFld ";
+	}
 
-	$order  = " ORDER BY $sortFld ";
 	if($keyWord){
 		if($queryField=="callingNumber")
 			$rrType=6;
 		else
 			$rrType=7;
 		$aWhere = " AND ($queryField like '%$keyWord%' or(recordType=$rrType and serviceCentre like '%$keyWord%'))";
-		if($sysId==375)
+		if($sysId==375||$sysId==400)
 			$aWhere = " AND $queryField like '%$keyWord%' ";
 		else if($sysId==386)
 		{
@@ -302,7 +312,7 @@ while(($dispNum<$dispNumOfPerPage)&&($cntTbNum_1<24)){
 			$order=" ORDER BY releaseTime DESC ";	
 		$selSql = $select.$where.$order.$limit;
 	}
-	if(0) 
+	if($DEBUG) 
 		echo "<br>down selSql=$selSql<br>";
 
 	$selRes = @mysqli_query($cdrDbConn,$selSql);
@@ -2181,6 +2191,32 @@ while(($dispNum<$dispNumOfPerPage)&&($cntTbNum_1<24)){
 		}
 		break;
 		//PPS CDR END
+
+	case '400':
+		if($tRecord){
+			do{
+				$recordType			=	$selRow[recordType];
+				$servedIMSI			=	$selRow[imsiDigit];
+				$showType			=	$selRow[showType];
+				$dataVolumeGPRSUplink=	$selRow[dataVolumeGPRSUplink];
+				$dataVolumeGPRSDownlink=	$selRow[dataVolumeGPRSDownlink];
+				$duration			=	$selRow[duration];
+				$accessPointNameOI			=	$selRow[accessPointNameOI];
+
+
+				echo "<tr>";
+				echo "<td>$showType</td>";
+				echo "<td>$servedIMSI</td>";
+				echo "<td>$dataVolumeGPRSUplink</td>";
+				echo "<td>$dataVolumeGPRSDownlink</td>";
+				echo "<td>$accessPointNameOI</td>";
+				echo "<td>$duration</td>";
+
+
+
+			}while(@$selRow = @mysqli_fetch_array($selRes));
+		}
+		break;
 	default:
 		break;
 	}//END switch*/
diff --git a/wxc2_omc/account/cdrList/cdrHeader.php b/wxc2_omc/account/cdrList/cdrHeader.php
index e1107a1..157cf19 100755
--- a/wxc2_omc/account/cdrList/cdrHeader.php
+++ b/wxc2_omc/account/cdrList/cdrHeader.php
@@ -159,7 +159,12 @@ while((($displayNum-$cntDispNum)<$dispNumOfPerPage)&&($nextTbNum<24)){
 			else
 				$rrType=7;
 			
-			$WHERE		= " $queryField like '%$keyWord%' or (recordType=$rrType and servedMSISDN like '%$keyWord%') ";
+				if($sysId == 400){
+					$WHERE		= " $queryField like '%$keyWord%' or (recordType=$rrType and MSISDN like '%$keyWord%') ";
+				}else{
+					$WHERE		= " $queryField like '%$keyWord%' or (recordType=$rrType and servedMSISDN like '%$keyWord%') ";
+				}
+
 			$WHERE		= "WHERE ".$WHERE;
 			$selSql			= "SELECT count(*) FROM $tbName[$nextTbNum] $WHERE ";
 		}else{
@@ -227,18 +232,18 @@ if($sysId==380)
 	else
 		$selSql=" SELECT count(*) FROM $tbName[$nextTbNum] WHERE servedIMSI like '%$keyWord%' ";
 }
-
-if($DEBUG)	
-	echo "selSql=$selSql<br>";
+//echo "selSql=$selSql<br>";
+if($DEBUG)	{	echo "selSql=$selSql<br>";}
 	$selRes = @mysqli_query($cdrDbConn,$selSql);
 	$selRow = @mysqli_fetch_array($selRes);
-	echo mysqli_error($cdrDbConn);
+	//echo mysqli_error($cdrDbConn);
 	if($selRow[0]=="")
 		$recordNum[$nextTbNum]	= 0;
 	else
 		$recordNum[$nextTbNum]	= $selRow[0];
 	if($DEBUG)	echo "recordNum[$nextTbNum]=$recordNum[$nextTbNum]<BR>";
 	$displayNum += $selRow[0];
+	//echo "dispNumOfPerPage=$dispNumOfPerPage;displayNum=$displayNum<BR>";
 	if(($cntDispNum+$dispNumOfPerPage)>$displayNum){
 		$nextTbNum++;
 	}
diff --git a/wxc2_omc/account/cdrList/cdrUp.php b/wxc2_omc/account/cdrList/cdrUp.php
index b734630..7fce766 100755
--- a/wxc2_omc/account/cdrList/cdrUp.php
+++ b/wxc2_omc/account/cdrList/cdrUp.php
@@ -116,15 +116,17 @@ switch($sysTypeNo){
 				//echo "<option value=\"serviceCentre\">Service centre</option>";
 				echo "</select>";
 				break;
+				case '400': // SGSN
+					echo "IMSI";
+					echo "<input type=\"hidden\" name=\"queryField\" value=\"imsiDigit\"> ";
+					break;
 			case '325':	//VLR
 			case '330': // HLR
-				echo "IMSI";
-				echo "<input type=\"hidden\" name=\"queryField\" value=\"servedIMSI\"> ";
-				break;
 			case '350': // SMSC
 				echo "MSISDN";
 				echo "<input type=\"hidden\" name=\"queryField\" value=\"servedMSISDN\"> ";
 				break;
+
 			default:
 				break;
 }