Commit 32e61303 authored by huangcb's avatar huangcb

解决新增告警规则,缓存更新错误的bug

parent ffa9caa3
...@@ -49,6 +49,9 @@ public class DataModelAlarmRuleController { ...@@ -49,6 +49,9 @@ public class DataModelAlarmRuleController {
// 保存告警规则 // 保存告警规则
dataModelAlarmRuleService.saveAlarmRule(form); dataModelAlarmRuleService.saveAlarmRule(form);
// 刷新缓存数据模型告警规则
dataModelAlarmRuleService.cacheInitAlarmRule();
return EResponse.ok(); return EResponse.ok();
} }
......
...@@ -42,7 +42,6 @@ public class DataModelAlarmRuleServiceImpl extends ServiceImpl<DataModelAlarmRul ...@@ -42,7 +42,6 @@ public class DataModelAlarmRuleServiceImpl extends ServiceImpl<DataModelAlarmRul
// 新增模型告警规则 // 新增模型告警规则
String[] notBlandParams = new String[]{"propertyId", "ruleExpression", "alarmLevel", "threshold"}; String[] notBlandParams = new String[]{"propertyId", "ruleExpression", "alarmLevel", "threshold"};
List<AlarmRuleItemForm> alarmRuleItemList = form.getAlarmRuleItemList(); List<AlarmRuleItemForm> alarmRuleItemList = form.getAlarmRuleItemList();
List<DataModelAlarmRuleDto> alarmRuleDtoList = new ArrayList<>();
for (AlarmRuleItemForm ruleItemForm : alarmRuleItemList) { for (AlarmRuleItemForm ruleItemForm : alarmRuleItemList) {
// 告警规则必填校验 // 告警规则必填校验
ReqUtils.checkParamsNotBlank(JSON.parseObject(ruleItemForm.toString()), notBlandParams); ReqUtils.checkParamsNotBlank(JSON.parseObject(ruleItemForm.toString()), notBlandParams);
...@@ -59,15 +58,7 @@ public class DataModelAlarmRuleServiceImpl extends ServiceImpl<DataModelAlarmRul ...@@ -59,15 +58,7 @@ public class DataModelAlarmRuleServiceImpl extends ServiceImpl<DataModelAlarmRul
sortEntity.setId(entity.getId()); sortEntity.setId(entity.getId());
sortEntity.setSortNum(entity.getId()); sortEntity.setSortNum(entity.getId());
this.getBaseMapper().updateById(sortEntity); this.getBaseMapper().updateById(sortEntity);
// 设置缓存数据
DataModelAlarmRuleDto dto = new DataModelAlarmRuleDto();
BeanUtils.copyProperties(entity, dto);
alarmRuleDtoList.add(dto);
} }
// 缓存数据模型告警规则
this.setCacheAlarmRule(modelId, alarmRuleDtoList);
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment