Jelajahi Sumber

增加报警条件查询redis

gaoyu 3 tahun lalu
induk
melakukan
0c28355059

+ 8 - 0
src/main/java/com/persagy/cache/AlarmRedisCache.java

@@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.persagy.constant.RedisConstant;
 import com.persagy.entity.AlarmConditionState;
 import com.persagy.entity.ZktAlarmRecordDO;
+import com.persagy.entity.v2.AlarmCondition;
 import com.persagy.repository.AlarmRecordRepository;
 import lombok.extern.slf4j.Slf4j;
 
@@ -63,4 +64,11 @@ public class AlarmRedisCache implements RedisCache {
 	public void setAlarmState(String defineId, AlarmConditionState alarmConditionState) {
 		emsRedisTemplate.opsForHash().put(RedisConstant.DEFINE_ID, defineId, JSON.toJSONString(alarmConditionState));
 	}
+
+	public AlarmCondition getAlarmConditionRedis(String conditionId) {
+		String str = emsRedisTemplate.opsForHash().get(RedisConstant.ALARMCONDITION_ID, conditionId).toString();
+		JSONObject object = JSONObject.parseObject(str);
+		AlarmCondition alarmCondition = JSON.toJavaObject(object, AlarmCondition.class);
+		return alarmCondition;
+	}
 }

+ 6 - 0
src/main/java/com/persagy/constant/RedisConstant.java

@@ -67,4 +67,10 @@ public class RedisConstant {
      * itemCode-objId拼接,用于根据defineId获取报警定义状态
      */
     public static final String DEFINE_ID = "DEFINE_ID";
+    
+    /**
+     * 报警条件Id REDIS hash 的 id
+     */
+    public static final String ALARMCONDITION_ID = "ALARMCONDITION_ID";
+    
 }

+ 2 - 1
src/main/java/com/persagy/mq/RabbitConfig.java

@@ -9,6 +9,7 @@ import org.springframework.context.annotation.Configuration;
 
 /**
  * RabbitConfig
+ * 
  * @author gaoyu
  *
  */
@@ -17,7 +18,7 @@ public class RabbitConfig {
 	/**
 	 * 交换机
 	 */
-	public static final String exchange = "exchange-alarm-service";
+	public static final String exchange = "exchange-msg-service";
 
 	/**
 	 * 报警消息路由键

File diff ditekan karena terlalu besar
+ 743 - 812
src/main/java/com/persagy/service/impl/AlarmHandleServiceImpl.java