fix: CDR返回信息调整

src/api/neData/ims.ts

@@ -29,14 +29,14 @@ export function delIMSDataCDR(cdrIds: string | number) {
 
 /**
  * IMS-CDR会话列表导出
- * @param data 查询列表条件
+ * @param query 查询列表条件
  * @returns object
  */
-export function exportIMSDataCDR(data: Record<string, any>) {
+export function exportIMSDataCDR(query: Record<string, any>) {
   return request({
     url: '/neData/ims/cdr/export',
-    method: 'POST',
+    method: 'GET',
-    data,
+    params: query,
     responseType: 'blob',
     timeout: 60_000,
   });

src/api/neData/sgwc.ts

@@ -29,14 +29,14 @@ export function delSGWCDataCDR(cdrIds: string | number) {
 
 /**
  * SGWC-CDR会话列表导出
- * @param data 查询列表条件
+ * @param query 查询列表条件
  * @returns object
  */
-export function exportSGWCDataCDR(data: Record<string, any>) {
+export function exportSGWCDataCDR(query: Record<string, any>) {
   return request({
     url: '/neData/sgwc/cdr/export',
-    method: 'POST',
+    method: 'GET',
-    data,
+    params: query,
     responseType: 'blob',
     timeout: 60_000,
   });

src/api/neData/smf.ts

@@ -29,14 +29,14 @@ export function delSMFDataCDR(cdrIds: string | number) {
 
 /**
  * SMF-CDR会话列表导出
- * @param data 查询列表条件
+ * @param query 查询列表条件
  * @returns object
  */
-export function exportSMFDataCDR(data: Record<string, any>) {
+export function exportSMFDataCDR(query: Record<string, any>) {
   return request({
     url: '/neData/smf/cdr/export',
-    method: 'POST',
+    method: 'GET',
-    data,
+    params: query,
     responseType: 'blob',
     timeout: 60_000,
   });

src/views/dashboard/imsCDR/index.vue

@@ -290,14 +290,11 @@ function fnTableSelectedRowKeys(keys: (string | number)[]) {
 type ModalStateType = {
   /**确定按钮 loading */
   confirmLoading: boolean;
-  /**最大ID值 */
-  maxId: number;
 };
 
 /**对话框对象信息状态 */
 let modalState: ModalStateType = reactive({
   confirmLoading: false,
-  maxId: 0,
 });
 
 /**
@@ -399,11 +396,6 @@ function fnGetList(pageNum?: number) {
 
         return item;
       });
-
-      // 取最大值ID用作实时累加
-      if (total > 0) {
-        modalState.maxId = Number(rows[0].id);
-      }
     }
     tableState.loading = false;
   });
@@ -490,15 +482,18 @@ function wsMessage(res: Record<string, any>) {
   // cdrEvent CDR会话事件
   if (data.groupId === `1005_${queryParams.neId}`) {
     const cdrEvent = data.data;
+    let cdrJSON = {};
+    try {
+      cdrJSON = JSON.parse(cdrEvent.cdrJSON);
+    } catch (e) {}
     queue.add(async () => {
-      modalState.maxId += 1;
       tableState.data.unshift({
-        id: modalState.maxId,
+        id: cdrEvent.id,
         neType: cdrEvent.neType,
         neName: cdrEvent.neName,
         rmUID: cdrEvent.rmUID,
         timestamp: cdrEvent.timestamp,
-        cdrJSON: cdrEvent.CDR,
+        cdrJSON: cdrJSON,
       });
       tablePagination.total += 1;
       if (tableState.data.length > 100) {

src/views/dashboard/sgwcCDR/index.vue

@@ -260,14 +260,11 @@ function fnTableSelectedRowKeys(keys: (string | number)[]) {
 type ModalStateType = {
   /**确定按钮 loading */
   confirmLoading: boolean;
-  /**最大ID值 */
-  maxId: number;
 };
 
 /**对话框对象信息状态 */
 let modalState: ModalStateType = reactive({
   confirmLoading: false,
-  maxId: 0,
 });
 
 /**
@@ -369,11 +366,6 @@ function fnGetList(pageNum?: number) {
 
         return item;
       });
-
-      // 取最大值ID用作实时累加
-      if (total > 0) {
-        modalState.maxId = Number(rows[0].id);
-      }
     }
     tableState.loading = false;
   });
@@ -460,15 +452,18 @@ function wsMessage(res: Record<string, any>) {
   // cdrEvent CDR会话事件
   if (data.groupId === `1008_${queryParams.neId}`) {
     const cdrEvent = data.data;
+    let cdrJSON = {};
+    try {
+      cdrJSON = JSON.parse(cdrEvent.cdrJSON);
+    } catch (e) {}
     queue.add(async () => {
-      modalState.maxId += 1;
       tableState.data.unshift({
-        id: modalState.maxId,
+        id: cdrEvent.id,
         neType: cdrEvent.neType,
         neName: cdrEvent.neName,
         rmUID: cdrEvent.rmUID,
         timestamp: cdrEvent.timestamp,
-        cdrJSON: cdrEvent.CDR,
+        cdrJSON: cdrJSON,
       });
       tablePagination.total += 1;
       if (tableState.data.length > 100) {

src/views/dashboard/smfCDR/index.vue

@@ -287,14 +287,11 @@ function fnTableSelectedRowKeys(keys: (string | number)[]) {
 type ModalStateType = {
   /**确定按钮 loading */
   confirmLoading: boolean;
-  /**最大ID值 */
-  maxId: number;
 };
 
 /**对话框对象信息状态 */
 let modalState: ModalStateType = reactive({
   confirmLoading: false,
-  maxId: 0,
 });
 
 /**
@@ -396,11 +393,6 @@ function fnGetList(pageNum?: number) {
 
         return item;
       });
-
-      // 取最大值ID用作实时累加
-      if (total > 0) {
-        modalState.maxId = Number(rows[0].id);
-      }
     }
     tableState.loading = false;
   });
@@ -487,15 +479,18 @@ function wsMessage(res: Record<string, any>) {
   // cdrEvent CDR会话事件
   if (data.groupId === `1006_${queryParams.neId}`) {
     const cdrEvent = data.data;
+    let cdrJSON = {};
+    try {
+      cdrJSON = JSON.parse(cdrEvent.cdrJSON);
+    } catch (e) {}
     queue.add(async () => {
-      modalState.maxId += 1;
       tableState.data.unshift({
-        id: modalState.maxId,
+        id: cdrEvent.id,
         neType: cdrEvent.neType,
         neName: cdrEvent.neName,
         rmUID: cdrEvent.rmUID,
         timestamp: cdrEvent.timestamp,
-        cdrJSON: cdrEvent.CDR,
+        cdrJSON: cdrJSON,
       });
       tablePagination.total += 1;
       if (tableState.data.length > 100) {

src/views/dashboard/smfCDRByIMSI/index.vue

@@ -505,6 +505,10 @@ function fnRealTime() {
       // cdrEvent CDR会话事件
       if (data.groupId === `1006_${queryParams.neId}`) {
         const cdrEvent = data.data;
+        let cdrJSON: any = {};
+        try {
+          cdrJSON = JSON.parse(cdrEvent.cdrJSON);
+        } catch (e) {}
         // 对应结束时间内
         if (queryParams.endTime) {
           const endTime = Math.round(queryParams.endTime / 1000);
@@ -512,7 +516,6 @@ function fnRealTime() {
             return;
           }
         }
-        const cdrJSON = cdrEvent.CDR;
         if (!cdrJSON.invocationTimestamp) {
           return;
         }

src/views/dashboard/smscCDR/index.vue

@@ -254,14 +254,11 @@ function fnTableSelectedRowKeys(keys: (string | number)[]) {
 type ModalStateType = {
   /**确定按钮 loading */
   confirmLoading: boolean;
-  /**最大ID值 */
-  maxId: number;
 };
 
 /**对话框对象信息状态 */
 let modalState: ModalStateType = reactive({
   confirmLoading: false,
-  maxId: 0,
 });
 
 /**
@@ -363,11 +360,6 @@ function fnGetList(pageNum?: number) {
 
         return item;
       });
-
-      // 取最大值ID用作实时累加
-      if (total > 0) {
-        modalState.maxId = Number(rows[0].id);
-      }
     }
     tableState.loading = false;
   });
@@ -454,15 +446,18 @@ function wsMessage(res: Record<string, any>) {
   // cdrEvent CDR会话事件
   if (data.groupId === `1007_${queryParams.neId}`) {
     const cdrEvent = data.data;
+    let cdrJSON = {};
+    try {
+      cdrJSON = JSON.parse(cdrEvent.cdrJSON);
+    } catch (e) {}
     queue.add(async () => {
-      modalState.maxId += 1;
       tableState.data.unshift({
-        id: modalState.maxId,
+        id: cdrEvent.id,
         neType: cdrEvent.neType,
         neName: cdrEvent.neName,
         rmUID: cdrEvent.rmUID,
         timestamp: cdrEvent.timestamp,
-        cdrJSON: cdrEvent.CDR,
+        cdrJSON: cdrJSON,
       });
       tablePagination.total += 1;
       if (tableState.data.length > 100) {