update 调整单次纪录位置

consumers/consumerAxySkAlarm.go

@@ -116,7 +116,8 @@ func (the *consumerAxySkAlarm) updateTriggerStationConfig() {
                     FROM t_alarm_trigger as at
                     left join t_sensor s
                     on at.struct_id=s.structure
-                    and at.factor_id=s.factor;`
+                    and at.factor_id=s.factor
+					order by s.id,at.alarm_level;`
 	err := the.infoPg.Query(&the.stationAlarmTrigger, sql)
 	if err != nil {
 		log.Printf("查询数据库异常:err-> %s", err.Error())
@@ -203,14 +204,14 @@ func (the *consumerAxySkAlarm) judgeSK() string {
 				alarmInfoTemplate = stationAlarmInfo.Alarm3008
 			}
 			if isAlarm && alarmInfoTemplate != nil {
-				conditionStr := fmt.Sprintf("st:%d,f:%d,level:%d",
-					trigger.StructId, trigger.FactorId, level)
-				onceTriggerStationAlarmMap[sid] = conditionStr
 				//判断历史有没有
 				isHisAlarm, hisK := the.isHistoryAlarm(sid, level, alarmTime)
 				if isHisAlarm {
 					continue
 				}
+				conditionStr := fmt.Sprintf("st:%d,f:%d,level:%d",
+					trigger.StructId, trigger.FactorId, level)
+				onceTriggerStationAlarmMap[sid] = conditionStr
 				//纪录历史告警
 				log.Printf("trigger.Id=%d, 测点[%s]本次触发双控,%s,时刻[%s]level=%d", trigger.Id, sid, hisK, alarmTime.Format("2006-01-02 15:04:05.000"), level)
 				the.historyStationAlarmMap[hisK] = AXY_SK.HistoryAlarm{