From 2155d9875471af487c074f283affb13b4ae72dee Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Sat, 8 Feb 2025 19:42:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9F=BA=E7=AB=99=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=8A=E6=8A=A5=E7=A7=BB=E9=99=A4=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E7=94=A8=E6=88=B7=E6=95=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/install/nb_state.sql | 1 - database/upgrade/upg_nb_state.sql | 1 - features/ue/ue.go | 2 -- src/modules/network_data/model/nb_state.go | 1 - src/modules/network_data/service/all_nb_state.go | 10 ++++------ 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/database/install/nb_state.sql b/database/install/nb_state.sql index 2a9983df..54eb8f25 100644 --- a/database/install/nb_state.sql +++ b/database/install/nb_state.sql @@ -13,7 +13,6 @@ CREATE TABLE `nb_state` ( `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '基站名称', `position` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '基站位置', `nb_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '-' COMMENT '基站设备名称', - `ue_num` int DEFAULT '0' COMMENT '在线用户数', `state` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'OFF' COMMENT '基站状态 OFF ON', `time` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '-' COMMENT '状态时间', PRIMARY KEY (`id`) USING BTREE, diff --git a/database/upgrade/upg_nb_state.sql b/database/upgrade/upg_nb_state.sql index 100f7167..bc26eea9 100644 --- a/database/upgrade/upg_nb_state.sql +++ b/database/upgrade/upg_nb_state.sql @@ -12,7 +12,6 @@ CREATE TABLE IF NOT EXISTS `nb_state` ( `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '基站名称', `position` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '基站位置', `nb_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '-' COMMENT '基站设备名称', - `ue_num` int DEFAULT '0' COMMENT '在线用户数', `state` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'OFF' COMMENT '基站状态 OFF ON', `time` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '-' COMMENT '状态时间', PRIMARY KEY (`id`) USING BTREE, diff --git a/features/ue/ue.go b/features/ue/ue.go index 67848360..7f940bb4 100644 --- a/features/ue/ue.go +++ b/features/ue/ue.go @@ -635,7 +635,6 @@ func PostNBInfoFromNF(w http.ResponseWriter, r *http.Request) { Name string `json:"name" ` Position string `json:"position" ` NbName string `json:"nbName" ` - UENum int64 `json:"ueNum" ` State string `json:"state" ` // "OFF" or "ON" OffTime string `json:"offTime" ` //if State=OFF, will set it OnTime string `json:"onTime" ` //if State=ON , will set it @@ -680,7 +679,6 @@ func PostNBInfoFromNF(w http.ResponseWriter, r *http.Request) { Name: v.Name, Position: v.Position, NbName: v.NbName, - UeNum: v.UENum, State: v.State, Time: timeStr, }) diff --git a/src/modules/network_data/model/nb_state.go b/src/modules/network_data/model/nb_state.go index 0468486e..6f422a42 100644 --- a/src/modules/network_data/model/nb_state.go +++ b/src/modules/network_data/model/nb_state.go @@ -9,7 +9,6 @@ type NBState struct { CreateTime int64 `json:"createTime" gorm:"column:create_time"` // 创建时间 Address string `json:"address" gorm:"column:address"` // 基站IP地址 NbName string `json:"nbName" gorm:"column:nb_name"` // 基站设备名称 - UeNum int64 `json:"ueNum" gorm:"column:ue_num"` // 在线用户数 Name string `json:"name" gorm:"column:name"` // 基站名称 Position string `json:"position" gorm:"column:position"` // 基站位置 State string `json:"state" gorm:"column:state"` // 基站状态 OFF ON diff --git a/src/modules/network_data/service/all_nb_state.go b/src/modules/network_data/service/all_nb_state.go index a34c83c9..0b06a4bd 100644 --- a/src/modules/network_data/service/all_nb_state.go +++ b/src/modules/network_data/service/all_nb_state.go @@ -55,9 +55,8 @@ func (r NBState) ExportXlsx(rows []model.NBState, fileName, language string) (st "C1": i18n.TKey(language, "nbState.export.position"), "D1": i18n.TKey(language, "nbState.export.address"), "E1": i18n.TKey(language, "nbState.export.nbName"), - "F1": i18n.TKey(language, "nbState.export.ueNum"), - "G1": i18n.TKey(language, "nbState.export.state"), - "H1": i18n.TKey(language, "nbState.export.time"), + "F1": i18n.TKey(language, "nbState.export.state"), + "G1": i18n.TKey(language, "nbState.export.time"), } // 从第二行开始的数据 @@ -75,9 +74,8 @@ func (r NBState) ExportXlsx(rows []model.NBState, fileName, language string) (st "C" + idx: row.Position, "D" + idx: row.Address, "E" + idx: row.NbName, - "F" + idx: row.UeNum, - "G" + idx: statusValue, - "H" + idx: row.Time, + "F" + idx: statusValue, + "G" + idx: row.Time, }) }