Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
iot-service
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SuperHive
back-end
iot-service
Commits
32e61303
Commit
32e61303
authored
Aug 10, 2020
by
huangcb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决新增告警规则,缓存更新错误的bug
parent
ffa9caa3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
9 deletions
+3
-9
DataModelAlarmRuleController.java
...le/datamodel/controller/DataModelAlarmRuleController.java
+3
-0
DataModelAlarmRuleServiceImpl.java
...datamodel/service/impl/DataModelAlarmRuleServiceImpl.java
+0
-9
No files found.
src/main/java/com/esv/datacenter/iot/module/datamodel/controller/DataModelAlarmRuleController.java
View file @
32e61303
...
...
@@ -49,6 +49,9 @@ public class DataModelAlarmRuleController {
// 保存告警规则
dataModelAlarmRuleService
.
saveAlarmRule
(
form
);
// 刷新缓存数据模型告警规则
dataModelAlarmRuleService
.
cacheInitAlarmRule
();
return
EResponse
.
ok
();
}
...
...
src/main/java/com/esv/datacenter/iot/module/datamodel/service/impl/DataModelAlarmRuleServiceImpl.java
View file @
32e61303
...
...
@@ -42,7 +42,6 @@ public class DataModelAlarmRuleServiceImpl extends ServiceImpl<DataModelAlarmRul
// 新增模型告警规则
String
[]
notBlandParams
=
new
String
[]{
"propertyId"
,
"ruleExpression"
,
"alarmLevel"
,
"threshold"
};
List
<
AlarmRuleItemForm
>
alarmRuleItemList
=
form
.
getAlarmRuleItemList
();
List
<
DataModelAlarmRuleDto
>
alarmRuleDtoList
=
new
ArrayList
<>();
for
(
AlarmRuleItemForm
ruleItemForm
:
alarmRuleItemList
)
{
// 告警规则必填校验
ReqUtils
.
checkParamsNotBlank
(
JSON
.
parseObject
(
ruleItemForm
.
toString
()),
notBlandParams
);
...
...
@@ -59,15 +58,7 @@ public class DataModelAlarmRuleServiceImpl extends ServiceImpl<DataModelAlarmRul
sortEntity
.
setId
(
entity
.
getId
());
sortEntity
.
setSortNum
(
entity
.
getId
());
this
.
getBaseMapper
().
updateById
(
sortEntity
);
// 设置缓存数据
DataModelAlarmRuleDto
dto
=
new
DataModelAlarmRuleDto
();
BeanUtils
.
copyProperties
(
entity
,
dto
);
alarmRuleDtoList
.
add
(
dto
);
}
// 缓存数据模型告警规则
this
.
setCacheAlarmRule
(
modelId
,
alarmRuleDtoList
);
}
@Override
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment