|
|
@@ -172,16 +172,16 @@ public class IotWorkRuleServiceImpl extends ServiceImpl<IotWorkRuleMapper, IotWo
|
|
|
//删除需要修改的数据,剩下的就是需要新增的数据
|
|
|
items.removeIf(item -> updateList.stream().anyMatch(next -> ObjectUtil.equal(next.getZoneId(), item.getZoneId()) && ObjectUtil.equal(next.getAlarmHost(), item.getHostDeviceName())));
|
|
|
}
|
|
|
- if (items != null && items.size() > 0){
|
|
|
- for(WorkRuleItemReq itemReq : items){
|
|
|
- IotWorkRuleItem item = new IotWorkRuleItem();
|
|
|
- item.setRuleId(workRule.getId());
|
|
|
- item.setZoneId(itemReq.getZoneId());
|
|
|
- item.setAlarmHost(itemReq.getHostDeviceName());
|
|
|
- item.setIotToken(iotToken);
|
|
|
- item.setObjId(getSubSystemId(itemReq.getZoneId(),itemReq.getHostDeviceName(),iotToken));
|
|
|
- addList.add(item);
|
|
|
- }
|
|
|
+ }
|
|
|
+ if (items != null && items.size() > 0){
|
|
|
+ for(WorkRuleItemReq itemReq : items){
|
|
|
+ IotWorkRuleItem item = new IotWorkRuleItem();
|
|
|
+ item.setRuleId(workRule.getId());
|
|
|
+ item.setZoneId(itemReq.getZoneId());
|
|
|
+ item.setAlarmHost(itemReq.getHostDeviceName());
|
|
|
+ item.setIotToken(iotToken);
|
|
|
+ item.setObjId(getSubSystemId(itemReq.getZoneId(),itemReq.getHostDeviceName(),iotToken));
|
|
|
+ addList.add(item);
|
|
|
}
|
|
|
}
|
|
|
}else {
|