恢复告警字符串数组

consumers/consumerSavoirTheme.go

@@ -155,9 +155,8 @@ func (the *consumerSavoirTheme) judgeOffline() {
 			if err != nil {
 				log.Printf("查询es 异常")
 			}
-			for _, alarmTheme := range allAlarmThemes {
+			for _, alarmThemeName := range allAlarmThemes {
-				detailPoint := extractSensorName(alarmTheme.Detail)
+				if theme.SensorName == alarmThemeName {
-				if theme.SensorName == detailPoint {
 					if offlineMin < float64(gap.OfflineGap) {
 						alarmMsg := models.KafkaAlarm{
 							MessageMode:   "AlarmAutoElimination",

dbOperate/elasticsearchHelper.go

@@ -208,17 +208,17 @@ func (the *ESHelper) SearchThemeData(index string, queryBody string) ([]models.E
 	return themes, err
 }
 
-func (the *ESHelper) SearchAlarmThemeData(index string, queryBody string) ([]models.EsAlarmTheme, error) {
+func (the *ESHelper) SearchAlarmThemeData(index string, queryBody string) ([]string, error) {
-	var themes []models.EsAlarmTheme
+	var sensorNames []string
 	themesResp, err := the.searchAlarmThemes(index, queryBody)
 
-	var theme models.EsAlarmTheme
+	var sensorName string
-	if len(themesResp.Hits.Hits) > 0 {
+	for _, themesResptheme := range themesResp.Hits.Hits {
-		theme = models.EsAlarmTheme(themesResp.Hits.Hits[0].Source)
+		sensorName = themesResptheme.Source.SensorName
-		themes = append(themes, theme)
+		sensorNames = append(sensorNames, sensorName)
 	}
 
-	return themes, err
+	return sensorNames, err
 }
 
 func (the *ESHelper) BulkWrite(index, reqBody string) {

models/esTheme.go

@@ -17,17 +17,9 @@ type EsTheme struct {
 }
 
 type EsAlarmTheme struct {
-	SensorName      string         `json:"sensor_name"`
+	SensorName string `json:"sensor_name"`
-	FactorName      string         `json:"factor_name"`
+	SensorId   string `json:"source_id"`
-	FactorProtoCode string         `json:"factor_proto_code"`
+	Detail     string `json:"detail"`
-	Data            map[string]any `json:"data"`
-	Detail          string         `json:"detail"`
-	Factor          int            `json:"factor"`
-	CollectTime     time.Time      `json:"collect_time"`
-	Sensor          int            `json:"sensor"`
-	Structure       int            `json:"structure"`
-	IotaDevice      []string       `json:"iota_device"`
-	CreateTime      time.Time      `json:"create_time"`
 }
 
 type EsThemeResp struct {