From 27b2cfb449ffd6c2aaff3f0cc23bd5a596e75cee Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 15 Jul 2025 19:50:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4MML=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mmlManage/neOperate.ts | 38 ++++++++++-------------- src/api/mmlManage/udmOperate.ts | 38 ++++++++++-------------- src/views/mmlManage/neOperate/index.vue | 14 ++++----- src/views/mmlManage/udmOperate/index.vue | 4 +-- 4 files changed, 39 insertions(+), 55 deletions(-) diff --git a/src/api/mmlManage/neOperate.ts b/src/api/mmlManage/neOperate.ts index 34cb3f2c..a4744380 100644 --- a/src/api/mmlManage/neOperate.ts +++ b/src/api/mmlManage/neOperate.ts @@ -1,6 +1,4 @@ -import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import { request } from '@/plugins/http-fetch'; -import { parseObjLineToHump } from '@/utils/parse-utils'; /** * 查询网元可用cmd命令 @@ -8,22 +6,17 @@ import { parseObjLineToHump } from '@/utils/parse-utils'; * @returns object */ export async function getMMLByNE(neType: string) { - // 发起请求 - const result = await request({ - url: `/api/rest/databaseManagement/v1/elementType/omc_db/objectType/mml_system`, + return request({ + url: '/tool/mml/system/list', method: 'GET', params: { - SQL: `select * from mml_system where ne_type = '${neType}' and status = 'Active'`, + neType: neType, + status: 'Active', + pageNum: 1, + pageSize: 1000, }, + timeout: 60_000, }); - // 解析数据 - if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) { - let data = result.data.data[0]; - return Object.assign(result, { - data: parseObjLineToHump(data['mml_system']), - }); - } - return result; } /** @@ -40,16 +33,15 @@ export async function sendMMlByNE( objectType: string, cmdArr: string[] ) { - // 发起请求 - const result = await request({ - url: `/api/rest/operationManagement/v1/elementType/${neType}/objectType/${objectType}?ne_id=${neId}`, + return request({ + url: '/tool/mml/command', method: 'POST', - data: { mml: cmdArr }, + data: { + neType: neType, + neId: neId, + type: objectType, + command: cmdArr, + }, timeout: 180_000, }); - // 解析数据 - if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) { - result.data = result.data.data; - } - return result; } diff --git a/src/api/mmlManage/udmOperate.ts b/src/api/mmlManage/udmOperate.ts index 31042eae..5fa50452 100644 --- a/src/api/mmlManage/udmOperate.ts +++ b/src/api/mmlManage/udmOperate.ts @@ -1,28 +1,21 @@ -import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import { request } from '@/plugins/http-fetch'; -import { parseObjLineToHump } from '@/utils/parse-utils'; /** * 查询UDM可用cmd命令 * @returns object */ export async function getMMLByUDM() { - // 发起请求 - const result = await request({ - url: `/api/rest/databaseManagement/v1/elementType/omc_db/objectType/mml_subscriber`, + return request({ + url: '/tool/mml/subscriber/list', method: 'GET', params: { - SQL: `select * from mml_subscriber where ne_type = 'UDM' and status = 'Active'`, + neType: 'UDM', + status: 'Active', + pageNum: 1, + pageSize: 1000, }, + timeout: 60_000, }); - // 解析数据 - if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) { - let data = result.data.data[0]; - return Object.assign(result, { - data: parseObjLineToHump(data['mml_subscriber']), - }); - } - return result; } /** @@ -32,16 +25,15 @@ export async function getMMLByUDM() { * @returns */ export async function sendMMlByUDM(neId: string, cmdArr: string[]) { - // 发起请求 - const result = await request({ - url: `/api/rest/operationManagement/v1/elementType/UDM/objectType/mml?ne_id=${neId}`, + return request({ + url: '/tool/mml/command', method: 'POST', - data: { mml: cmdArr }, + data: { + neType: 'UDM', + neId: neId, + type: 'General', + command: cmdArr, + }, timeout: 180_000, }); - // 解析数据 - if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) { - result.data = result.data.data; - } - return result; } diff --git a/src/views/mmlManage/neOperate/index.vue b/src/views/mmlManage/neOperate/index.vue index 714b3fab..3dec8ee2 100644 --- a/src/views/mmlManage/neOperate/index.vue +++ b/src/views/mmlManage/neOperate/index.vue @@ -48,7 +48,7 @@ let state: StateType = reactive({ key: '', operation: '', object: '', - objectType: 'mml', + objectType: 'General', param: [], }, from: { @@ -103,7 +103,7 @@ function fnCleanFrom() { key: '', operation: '', object: '', - objectType: 'mml', + objectType: 'General', param: [], }; state.from = {}; @@ -342,7 +342,7 @@ function fnNeChange(keys: any, _: any) { key: '', operation: '', object: '', - objectType: 'mml', + objectType: 'General', param: {}, }; fnGetList(); @@ -354,12 +354,12 @@ function fnGetList() { const neType = state.neType[0]; state.mmlNeType = neType; getMMLByNE(neType).then(res => { - if (res.code === RESULT_CODE_SUCCESS) { + if (res.code === RESULT_CODE_SUCCESS && res.data) { // 构建自动完成筛选结构 const autoCompleteArr: Record[] = []; // 构建树结构 const treeArr: Record[] = []; - for (const item of res.data) { + for (const item of res.data.rows) { const id = item['id']; const object = item['object']; const objectType = item['objectType']; @@ -680,10 +680,10 @@ onMounted(() => { v-model:value="state.mmlSelect.objectType" style="width: 20%" > - + {{ t('views.mmlManage.neOperate.mml') }} - + {{ t('views.mmlManage.neOperate.mml2') }} diff --git a/src/views/mmlManage/udmOperate/index.vue b/src/views/mmlManage/udmOperate/index.vue index 2fa177e4..4805a7f4 100644 --- a/src/views/mmlManage/udmOperate/index.vue +++ b/src/views/mmlManage/udmOperate/index.vue @@ -342,12 +342,12 @@ function ruleVerification( /**查询可选命令列表 */ function fnGetList() { getMMLByUDM().then(res => { - if (res.code === RESULT_CODE_SUCCESS) { + if (res.code === RESULT_CODE_SUCCESS && res.data) { // 构建自动完成筛选结构 const autoCompleteArr: Record[] = []; // 构建树结构 const treeArr: Record[] = []; - for (const item of res.data) { + for (const item of res.data.rows) { const id = item['id']; const object = item['object']; const operation = item['operation'];