|
@@ -179,7 +179,7 @@ public class AlarmInfoCache {
|
|
/**
|
|
/**
|
|
* @param meterId: 表号
|
|
* @param meterId: 表号
|
|
* @param funcId: 功能号
|
|
* @param funcId: 功能号
|
|
- * @description:根据表号功能号获取多条报警定义id
|
|
|
|
|
|
+ * @description:根据表号功能号获取多条报警定义
|
|
* @exception:
|
|
* @exception:
|
|
* @author: LuoGuangyi
|
|
* @author: LuoGuangyi
|
|
* @company: Persagy Technology Co.,Ltd
|
|
* @company: Persagy Technology Co.,Ltd
|
|
@@ -187,7 +187,7 @@ public class AlarmInfoCache {
|
|
* @since: 2020/10/19 14:31
|
|
* @since: 2020/10/19 14:31
|
|
* @version: V1.0
|
|
* @version: V1.0
|
|
*/
|
|
*/
|
|
- public List<AlarmDefine> getAlarmDefinitionIdByMeterFuncId(String meterId, String funcId) {
|
|
|
|
|
|
+ public List<AlarmDefine> getAlarmDefinitionsByMeterFuncId(String meterId, String funcId) {
|
|
return infoAlarmMap.get(getKey(meterId, funcId));
|
|
return infoAlarmMap.get(getKey(meterId, funcId));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -205,7 +205,7 @@ public class AlarmInfoCache {
|
|
* @version: V1.0
|
|
* @version: V1.0
|
|
*/
|
|
*/
|
|
public void putAlarmDefinitionIdByMeterFuncId(String meterId, String funcId, AlarmDefine definition) {
|
|
public void putAlarmDefinitionIdByMeterFuncId(String meterId, String funcId, AlarmDefine definition) {
|
|
- List<AlarmDefine> definitionList = getAlarmDefinitionIdByMeterFuncId(meterId, funcId);
|
|
|
|
|
|
+ List<AlarmDefine> definitionList = getAlarmDefinitionsByMeterFuncId(meterId, funcId);
|
|
if (CollectionUtils.isEmpty(definitionList)) {
|
|
if (CollectionUtils.isEmpty(definitionList)) {
|
|
definitionList = new ArrayList<>();
|
|
definitionList = new ArrayList<>();
|
|
}
|
|
}
|