فهرست منبع

调整redis报警存储,数据库报警存储

chenwen 1 سال پیش
والد
کامیت
7170ad6a5d

+ 1 - 1
src/main/java/com/hb/proj/gather/business/DataTransRepSingleTask.java

@@ -70,7 +70,7 @@ public class DataTransRepSingleTask implements Runnable{
 			RedisRepComponent repRedis=ApplicationContextUtils.getBean("redisRepComponent", RedisRepComponent.class);
 			repRedis.put(paramConfig.getWellId(), redisDatas);
 			
-			repRedis.put(paramConfig.getWellId(), buildRedisAlarm(almlogs));
+			repRedis.put(paramConfig.getWellId()+"_alarm", buildRedisAlarm(almlogs));
 			
 			GatherDataRepService repService=ApplicationContextUtils.getBean("gatherDataRepService", GatherDataRepService.class);
 			repService.save(mappingDatas.values());  //入库

+ 2 - 5
src/main/java/com/hb/proj/gather/rep/GatherDataRepService.java

@@ -11,7 +11,6 @@ import com.hb.proj.gather.model.AlarmLogVO;
 import com.hb.proj.gather.model.DiagramPO;
 import com.hb.proj.gather.model.SingleInsertPO;
 import com.hb.xframework.dao.core.SpringJdbcDAO;
-import com.hb.xframework.dao.util.UUIDHexGenerator;
 
 /**
  * 采集程序数据持久化
@@ -33,7 +32,7 @@ public class GatherDataRepService {
 			return;
 		}
 		String sql="""
-				insert into tzl_alarm_log(record_id,alarm_time,alarm_desc,alarm_holder,alarm_source) values(?,?,?,?,?)
+				insert into tzl_alarm_log(alarm_time,alarm_desc,alarm_holder,alarm_source) values(?,?,?,?)
 				""";
 		dao.getJdbcTemplate().batchUpdate(sql, buildAlarmBatchParams(almlogs));
 	}
@@ -97,11 +96,9 @@ public class GatherDataRepService {
 
 		List<Object[]>  params=new ArrayList<>(almlogs.size());
 		
-		UUIDHexGenerator  uuid=UUIDHexGenerator.getInstance();
-		
 		for(AlarmLogVO vo : almlogs) {
 			
-			params.add(new Object[] {uuid.generate(),vo.getAlarmTime(),vo.getAlarmDesc(),vo.getAlarmHolder(),vo.getAlarmSource()});
+			params.add(new Object[] {vo.getAlarmTime(),vo.getAlarmDesc(),vo.getAlarmHolder(),vo.getAlarmSource()});
 		}
 		
 		return params;