diff --git a/src/apis/domain/biz/diag/ndm-switch-diag-info.ts b/src/apis/domain/biz/diag/ndm-switch-diag-info.ts index aea0e4f..d0f20fc 100644 --- a/src/apis/domain/biz/diag/ndm-switch-diag-info.ts +++ b/src/apis/domain/biz/diag/ndm-switch-diag-info.ts @@ -10,12 +10,12 @@ export interface NdmSwitchDiagInfo { } export interface NdmSwitchPortInfo { - flow: number; inBytes: number; - inFlow: number; lastInBytes: number; lastOutBytes: number; outBytes: number; + flow: number; + inFlow: number; outFlow: number; portName: string; upDown: number; diff --git a/src/components/helper/switch-port.ts b/src/components/helper/switch-port.ts index 850fc91..12cab56 100644 --- a/src/components/helper/switch-port.ts +++ b/src/components/helper/switch-port.ts @@ -1,5 +1,4 @@ import type { NdmSwitchPortInfo } from '@/apis'; -import { JAVA_UNSIGNED_INTEGER_MAX_VALUE, NDM_SWITCH_PROBE_INTERVAL } from '@/constants'; export const getPortStatusVal = (portInfo: NdmSwitchPortInfo): string => { const { upDown } = portInfo; @@ -7,47 +6,21 @@ export const getPortStatusVal = (portInfo: NdmSwitchPortInfo): string => { }; export const transformPortSpeed = (portInfo: NdmSwitchPortInfo, type: 'in' | 'out' | 'total'): string => { - const units = ['B/s', 'KB/s', 'MB/s', 'GB/s', 'TB/s']; - const { inBytes, lastInBytes, outBytes, lastOutBytes, inFlow, outFlow, flow } = portInfo; + const units = ['b/s', 'Kb/s', 'Mb/s', 'Gb/s', 'Tb/s']; + const { inFlow, outFlow, flow } = portInfo; let result: number = 0; - if (inFlow && outFlow && flow) { - if (type === 'in') { - result = inFlow; - } - if (type === 'out') { - result = outFlow; - } - if (type === 'total') { - result = flow; - } - } else { - let dInBytes = 0; - let dOutBytes = 0; - if (inBytes < lastInBytes) { - dInBytes = inBytes + JAVA_UNSIGNED_INTEGER_MAX_VALUE - lastInBytes; - } else { - dInBytes = inBytes - lastInBytes; - } - if (outBytes < lastOutBytes) { - dOutBytes = outBytes + JAVA_UNSIGNED_INTEGER_MAX_VALUE - lastOutBytes; - } else { - dOutBytes = outBytes - lastOutBytes; - } - if (type === 'in') { - result = dInBytes; - } - if (type === 'out') { - result = dOutBytes; - } - if (type === 'total') { - result = dInBytes + dOutBytes; - } - result /= NDM_SWITCH_PROBE_INTERVAL; + if (type === 'in') { + result = inFlow; + } else if (type === 'out') { + result = outFlow; + } else if (type === 'total') { + result = flow; } let index = 0; while (result >= 1024 && index < units.length - 1) { result /= 1024; index++; } + result *= 8; return `${result.toFixed(3)} ${units[index]}`; }; diff --git a/src/constants/device.ts b/src/constants/device.ts deleted file mode 100644 index 8a04aa8..0000000 --- a/src/constants/device.ts +++ /dev/null @@ -1 +0,0 @@ -export const NDM_SWITCH_PROBE_INTERVAL = 5; diff --git a/src/constants/index.ts b/src/constants/index.ts index 12193b9..3da1f11 100644 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -1,4 +1,2 @@ -export * from './device'; -export * from './java'; export * from './query'; export * from './stomp'; diff --git a/src/constants/java.ts b/src/constants/java.ts deleted file mode 100644 index ccbb768..0000000 --- a/src/constants/java.ts +++ /dev/null @@ -1,2 +0,0 @@ -export const JAVA_INTEGER_MAX_VALUE = 2147483647; -export const JAVA_UNSIGNED_INTEGER_MAX_VALUE = 4294967295;