diff --git a/src/api/configManage/neManage.ts b/src/api/configManage/neManage.ts index 63f17166..bceb4887 100644 --- a/src/api/configManage/neManage.ts +++ b/src/api/configManage/neManage.ts @@ -1,5 +1,9 @@ -import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; -import { request } from '@/plugins/http-fetch'; +import { + RESULT_CODE_ERROR, + RESULT_CODE_SUCCESS, + RESULT_MSG_ERROR, +} from '@/constants/result-constants'; +import { language, request } from '@/plugins/http-fetch'; import { parseObjLineToHump } from '@/utils/parse-utils'; /** @@ -8,9 +12,8 @@ import { parseObjLineToHump } from '@/utils/parse-utils'; * @returns object */ export async function listNeInfo(query: Record) { - let totalSQL = - 'select count(*) as total from ne_info where (status=0 or status=3)'; - let rowsSQL = 'select * from ne_info where (status=0 or status=3) '; + let totalSQL = 'select count(*) as total from ne_info where 1=1 '; + let rowsSQL = 'select * from ne_info where 1=1 '; // 系统特定顺序 const specificOrder = [ @@ -92,15 +95,18 @@ export async function getNeInfo(id: string | number) { url: `/api/rest/databaseManagement/v1/select/omc_db/ne_info`, method: 'get', params: { - SQL: `select * from ne_info where (status=0 or status=3) and id = ${id}`, + SQL: `select * from ne_info where id = ${id}`, }, }); // 解析数据 if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) { - let data = result.data.data[0]; - return Object.assign(result, { - data: parseObjLineToHump(data['ne_info'][0]), - }); + let neInfo = result.data.data[0]['ne_info']; + if (neInfo) { + return Object.assign(result, { + data: parseObjLineToHump(neInfo[0]), + }); + } + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language] }; } return result; } @@ -148,54 +154,6 @@ export async function delNeInfo(data: Record) { }); } -/** - * 获取网元网元列表 - * @returns object - */ -export async function getNelistAll() { - // 系统特定顺序 - const specificOrder = [ - 'OMC', - 'MME', - 'AMF', - 'AUSF', - 'UDM', - 'SMF', - 'PCF', - 'UPF', - 'NRF', - 'NSSF', - 'IMS', - 'N3IWF', - 'NEF', - 'LMF', - ]; - // 发起请求 - const result = await request({ - url: `/api/rest/databaseManagement/v1/elementType/omc_db/objectType/ne_info`, - method: 'get', - params: { - SQL: `SELECT ne_type,ne_name,ne_id,ip FROM ne_info WHERE status in ('0','3')`, - }, - }); - // 解析数据 - if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) { - let data = result.data.data[0]; - //通过sort进行冒泡排序 - data['ne_info'].sort((a: any, b: any) => { - const typeA = specificOrder.indexOf(a.ne_type); - const typeB = specificOrder.indexOf(b.ne_type); - if (typeA === -1) return 1; - if (typeB === -1) return -1; - return typeA - typeB; - }); - return Object.assign(result, { - data: parseObjLineToHump(data['ne_info']), - }); - } - return result; -} - /** * 导出网元配置文件 * @param