调整获取redis内的报警信息

src/main/java/com/hb/proj/balarm/controller/AlarmLogController.java

@@ -1,9 +1,7 @@
 package com.hb.proj.balarm.controller;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +18,6 @@ import com.hb.proj.utils.RespVO;
 import com.hb.proj.utils.RespVOBuilder;
 import com.hb.xframework.dao.util.PageModel;
 import com.hb.xframework.util.DateUtil;
-import com.hb.xframework.util.MapUtils;
 
 import jakarta.validation.constraints.NotBlank;
 
@@ -75,30 +72,10 @@ public class AlarmLogController {
 		//Map<String,Object> alarms=null;
 		Map<String,Object>  rtnMap=new HashMap<String,Object>(wids.length);
 		for(String wid : wids) {
-			//alarms=ops.entries(wid+"_alarm");
-			rtnMap.put(wid, ops.entries(wid+"_alarm"));
+			rtnMap.put(wid, ops.entries("alarm_"+wid));
 		}
 		return RespVOBuilder.ok(rtnMap);
 	}
 	
-	/**
-	 * 从redis单井数据中提取报警内容
-	 * @param data
-	 * @return
-	 */
-	private List<Map<String,Object>>  extractAlarms(Map<String,String>  data){
-		List<Map<String,Object>>  alarms=new ArrayList<Map<String,Object>>();
-		String[] vals=null;
-		String time=data.get("time");
-		for(String key : data.keySet()) {
-			if(key.startsWith("time")||key.startsWith("diagram_")) {  //排除非报警属性
-				continue;
-			}
-			vals=data.get(key).split("\\|");  //deciaml|alarmLevel|alarmDesc
-			if(vals.length>2) {
-				alarms.add(MapUtils.build("alarmTime",time,"alarmDesc",vals[2]));
-			}
-		}
-		return alarms.size()>0?alarms:null;
-	}
+	
 }

src/main/java/com/hb/proj/data/controller/MultiPatrolController.java

@@ -106,7 +106,7 @@ public class MultiPatrolController {
 		for(String wellId : wellIds) {
 			 rtData=ops.entries(wellId);
 			 DataTransUtils.convertForSinglePatrl(rtData,buildParamMapping(wellId,wps));
-			 alarms=ops.entries(wellId+"_alarm");
+			 alarms=ops.entries("alarm_"+wellId);
 			 bindAlarm(rtData,alarms);
 			 wdataMap.get(wellId).putAll(rtData);
 		}

src/main/java/com/hb/proj/data/controller/MultiSortController.java

@@ -96,7 +96,7 @@ public class MultiSortController {
 			if(valobj!=null && (valobj instanceof Number)) {
 				
 				val=DataTransUtils.convert(wpmapping.get(wellId),(Double)valobj);
-				almobj=ops.get(wellId+"_alarm",paramCode);
+				almobj=ops.get("alarm_"+wellId,paramCode);
 				if(almobj!=null) {
 					val+=";"+almobj;
 				}

src/main/java/com/hb/proj/data/controller/SinglePatrolController.java

@@ -87,7 +87,7 @@ public class SinglePatrolController {
 		Map<String,WellParamPO> wpmap=buildParamMap(wpService.loadParamByWell(wellId));
 		HashOperations<String, String, Object>  ops=redisTemplate.opsForHash();
 		Map<String,Object>  rtData=ops.entries(wellId);
-		Map<String,Object>  alarms=ops.entries(wellId+"_alarm");
+		Map<String,Object>  alarms=ops.entries("alarm_"+wellId);
 		rtData.remove("diagram_load");
 		rtData.remove("diagram_current");
 		rtData.remove("diagram_power");