diff --git a/src/modules/network_data/service/cdr_event_sgwc.go b/src/modules/network_data/service/cdr_event_sgwc.go index 316024ea..a0ecb6c7 100644 --- a/src/modules/network_data/service/cdr_event_sgwc.go +++ b/src/modules/network_data/service/cdr_event_sgwc.go @@ -58,8 +58,8 @@ func (r CDREventSGWC) ExportXlsx(rows []model.CDREventSGWC, fileName string) (st "H1": "GPRS Downlink", "I1": "Duration", "J1": "Invocation Time", - "K1": "PGW Address Used", - "L1": "SGW Address", + "K1": "GGSN Address", + "L1": "SGSN Address", "M1": "RAT Type", "N1": "PDPPDN Type", "O1": "PDPPDN Address", @@ -69,6 +69,8 @@ func (r CDREventSGWC) ExportXlsx(rows []model.CDREventSGWC, fileName string) (st "S1": "Record Cause For Rec Closing", "T1": "Record Sequence Number", "U1": "Local Record Sequence Number", + "V1": "Record Type", + "W1": "Record Opening Time", } // 从第二行开始的数据 dataCells := make([]map[string]any, 0) @@ -101,11 +103,22 @@ func (r CDREventSGWC) ExportXlsx(rows []model.CDREventSGWC, fileName string) (st if v, ok := cdrJSON["pGWAddressUsed"]; ok && v != nil { pGWAddressUsed = fmt.Sprint(v) } + if v, ok := cdrJSON["GGSNAddress"]; ok && v != nil { + pGWAddressUsed = fmt.Sprint(v) + } // sGWAddress sGWAddress := "" if v, ok := cdrJSON["sGWAddress"]; ok && v != nil { sGWAddress = fmt.Sprint(v) } + if v, ok := cdrJSON["SGSNAddress"]; ok && v != nil { + sGWAddress = fmt.Sprint(v) + } + // recordType + recordType := "" + if v, ok := cdrJSON["recordType"]; ok && v != nil { + recordType = fmt.Sprint(v) + } // rATType rATType := "" if v, ok := cdrJSON["rATType"]; ok && v != nil { @@ -208,6 +221,8 @@ func (r CDREventSGWC) ExportXlsx(rows []model.CDREventSGWC, fileName string) (st "S" + idx: causeForRecClosing, "T" + idx: recordSequenceNumber, "U" + idx: localRecordSequenceNumber, + "V" + idx: recordType, + "W" + idx: invocationTimestamp, }) } diff --git a/src/modules/network_element/repository/ne_license.go b/src/modules/network_element/repository/ne_license.go index 5aad6b32..1d506fec 100644 --- a/src/modules/network_element/repository/ne_license.go +++ b/src/modules/network_element/repository/ne_license.go @@ -74,6 +74,10 @@ func (r *NeLicense) SelectPage(query map[string]any) map[string]any { conditions = append(conditions, "expiry_date = ?") params = append(params, strings.Trim(v.(string), " ")) } + if v, ok := query["serialNum"]; ok && v != "" { + conditions = append(conditions, "serial_num = ?") + params = append(params, strings.Trim(v.(string), " ")) + } if v, ok := query["createBy"]; ok && v != "" { conditions = append(conditions, "create_by like concat(?, '%')") params = append(params, strings.Trim(v.(string), " "))