From 4989f45a03feb77d130e3a4956e888304825900a Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 9 May 2025 11:54:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=91=8A=E8=AD=A6=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E7=9A=84AlarmCode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.go                                   |  4 ++++
 src/framework/constants/alarm.go          |  8 ++++++--
 src/modules/network_data/service/alarm.go | 11 ++++++++++-
 src/modules/ws/service/ws_send.go         |  4 +++-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/main.go b/main.go
index 831963f5..a4dfcd0d 100644
--- a/main.go
+++ b/main.go
@@ -74,6 +74,10 @@ var wg sync.WaitGroup
 // @tag.description			network data udm authentication interface
 // @tag.name					network_data/udm/sub
 // @tag.description			network data udm subscriber interface
+// @tag.name					network_data/udm/voip
+// @tag.description			network data udm voip interface
+// @tag.name					network_data/udm/volte-ims
+// @tag.description			network data udm volte interface
 // @tag.name					network_data/upf
 // @tag.description			network data upf interface
 //
diff --git a/src/framework/constants/alarm.go b/src/framework/constants/alarm.go
index e07f5067..f22c8e2d 100644
--- a/src/framework/constants/alarm.go
+++ b/src/framework/constants/alarm.go
@@ -2,8 +2,12 @@ package constants
 
 // 告警 alarmCode 常量
 const (
-	// ALARM_STATE_CHECK 告警-状态检查
-	ALARM_STATE_CHECK = 10000
 	// ALARM_EVENT_REBOOT 事件-网元重启
 	ALARM_EVENT_REBOOT = 9000
+	// ALARM_STATE_CHECK 告警-状态检查
+	ALARM_STATE_CHECK = 10000
+	// ALARM_RAM_CPU_CHECK 告警-内存/CPU/磁盘检查
+	ALARM_CMD_CHECK = 10001
+	// ALARM_LICENSE_CHECK 告警-网元License到期检查
+	ALARM_LICENSE_CHECK = 10002
 )
diff --git a/src/modules/network_data/service/alarm.go b/src/modules/network_data/service/alarm.go
index a7fcd286..bb98a45a 100644
--- a/src/modules/network_data/service/alarm.go
+++ b/src/modules/network_data/service/alarm.go
@@ -77,7 +77,7 @@ func (r Alarm) AlarmClearByIds(ids []int64, clearUser string) (int64, error) {
 		var rows int64 = 0
 		for _, v := range arr {
 			// 状态检查AlarmCode变更告警ID
-			if v.AlarmCode == constants.ALARM_STATE_CHECK {
+			if v.AlarmCode == constants.ALARM_STATE_CHECK || v.AlarmCode == constants.ALARM_CMD_CHECK || v.AlarmCode == constants.ALARM_LICENSE_CHECK {
 				v.AlarmId = fmt.Sprintf("%d%d", v.AlarmCode, v.EventTime)
 			}
 			v.AlarmStatus = "0"
@@ -120,6 +120,15 @@ func (r Alarm) AlarmAckByIds(ids []int64, ackUser string, ackState bool) (int64,
 	return 0, fmt.Errorf("ack fail")
 }
 
+// InsertAndForword 新增信息并转发通知
+func (s Alarm) InsertAndForword(param model.Alarm) int64 {
+	rows := s.alarmRepository.Insert(param)
+	if rows > 0 {
+		// 转发通知 TODO
+	}
+	return rows
+}
+
 // ExportXlsx 导出数据到 xlsx 文件
 func (r Alarm) ExportXlsx(rows []model.Alarm, fileName, language, alarmStatus string) (string, error) {
 	// 第一行表头标题
diff --git a/src/modules/ws/service/ws_send.go b/src/modules/ws/service/ws_send.go
index 3cf88541..adcccaef 100644
--- a/src/modules/ws/service/ws_send.go
+++ b/src/modules/ws/service/ws_send.go
@@ -16,6 +16,8 @@ const (
 	GROUP_TRACE_NE = "2"
 	// 组号-信令跟踪Packet 4_taskNo
 	GROUP_TRACE_PACKET = "4"
+	// 组号-网元状态 8_neType_neId
+	GROUP_NE_STATE = "8"
 	// 组号-指标通用 10_neType_neId
 	GROUP_KPI = "10"
 	// 组号-自定义KPI指标 20_neType_neId
@@ -34,7 +36,7 @@ const (
 	GROUP_MME_UE = "1011"
 	// 组号-告警 2000_neType_neId
 	GROUP_ALARM = "2000"
-	// 组号-告警事件 2000_neType_neId
+	// 组号-告警事件 2002_neType_neId
 	GROUP_ALARM_EVENT = "2002"
 )