|
@@ -84,6 +84,8 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public String createProjectAlarmRule(AddProjectAlarmRuleDTO addProjectAlarmRuleDTO) throws Exception {
|
|
public String createProjectAlarmRule(AddProjectAlarmRuleDTO addProjectAlarmRuleDTO) throws Exception {
|
|
ProjectAlarmRule projectAlarmRule = ConvertProjectAlarmRuleTool.INSTANCE.convertAddDto2Entity(addProjectAlarmRuleDTO);
|
|
ProjectAlarmRule projectAlarmRule = ConvertProjectAlarmRuleTool.INSTANCE.convertAddDto2Entity(addProjectAlarmRuleDTO);
|
|
|
|
+ String uuid = DataUtils.getUUID();
|
|
|
|
+ projectAlarmRule.setId(uuid);
|
|
AddAlarmConditionDTO addAlarmConditionDTO = addProjectAlarmRuleDTO.getAlarmCondition();
|
|
AddAlarmConditionDTO addAlarmConditionDTO = addProjectAlarmRuleDTO.getAlarmCondition();
|
|
if (addProjectAlarmRuleDTO.getBelong() == INTEGER_ONE) {
|
|
if (addProjectAlarmRuleDTO.getBelong() == INTEGER_ONE) {
|
|
//查询对应报警类型的集团规则,将ID添加到项目规则表
|
|
//查询对应报警类型的集团规则,将ID添加到项目规则表
|
|
@@ -98,7 +100,10 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
projectAlarmRule.setAlarmConditionId((String) map.get("id"));
|
|
projectAlarmRule.setAlarmConditionId((String) map.get("id"));
|
|
}
|
|
}
|
|
//新增关联关系
|
|
//新增关联关系
|
|
- projectAlarmRuleObjRelService.createBatchRelation(addProjectAlarmRuleDTO.getAddRelationList());
|
|
|
|
|
|
+ List<UpdateAlarmItemDTO> addRelationList = addProjectAlarmRuleDTO.getAddRelationList();
|
|
|
|
+ String projectId = addProjectAlarmRuleDTO.getProjectId();
|
|
|
|
+ List<AddProjectAlarmRuleObjRelDTO> addRelations = convert2AddProjectAlarmRuleObjRelDTO(addRelationList,uuid,projectId);
|
|
|
|
+ projectAlarmRuleObjRelService.createBatchRelation(addRelations);
|
|
// 设置默认值
|
|
// 设置默认值
|
|
projectAlarmRule.setCreationTime(new Date());
|
|
projectAlarmRule.setCreationTime(new Date());
|
|
setDefaultValue(projectAlarmRule);
|
|
setDefaultValue(projectAlarmRule);
|
|
@@ -216,7 +221,10 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
projectAlarmRule.setAlarmConditionId((String) map.get("id"));
|
|
projectAlarmRule.setAlarmConditionId((String) map.get("id"));
|
|
}
|
|
}
|
|
//新增关联关系
|
|
//新增关联关系
|
|
- List<AddProjectAlarmRuleObjRelDTO> addRelations = convert2AddProjectAlarmRuleObjRelDTO(updateProjectAlarmRuleDTO);
|
|
|
|
|
|
+ List<UpdateAlarmItemDTO> addRelationList = updateProjectAlarmRuleDTO.getAddRelationList();
|
|
|
|
+ String projectId = updateProjectAlarmRuleDTO.getProjectId();
|
|
|
|
+ String id = updateProjectAlarmRuleDTO.getId();
|
|
|
|
+ List<AddProjectAlarmRuleObjRelDTO> addRelations = convert2AddProjectAlarmRuleObjRelDTO(addRelationList,id,projectId);
|
|
projectAlarmRuleObjRelService.createBatchRelation(addRelations);
|
|
projectAlarmRuleObjRelService.createBatchRelation(addRelations);
|
|
|
|
|
|
//同步更新设备报警条件 begin
|
|
//同步更新设备报警条件 begin
|
|
@@ -224,7 +232,6 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
List<UpdateAlarmConfigDTO> updateAlarmConfigDTOs = new ArrayList();
|
|
List<UpdateAlarmConfigDTO> updateAlarmConfigDTOs = new ArrayList();
|
|
String condition = updateProjectAlarmRuleDTO.getCondition();
|
|
String condition = updateProjectAlarmRuleDTO.getCondition();
|
|
String classCode = updateProjectAlarmRuleDTO.getClassCode();
|
|
String classCode = updateProjectAlarmRuleDTO.getClassCode();
|
|
- String projectId = updateProjectAlarmRuleDTO.getProjectId();
|
|
|
|
QueryEquipDTO queryEquipDTO = new QueryEquipDTO();
|
|
QueryEquipDTO queryEquipDTO = new QueryEquipDTO();
|
|
queryEquipDTO.setProjectId(projectId);
|
|
queryEquipDTO.setProjectId(projectId);
|
|
queryEquipDTO.setClassCode(classCode);
|
|
queryEquipDTO.setClassCode(classCode);
|
|
@@ -256,11 +263,8 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- private List<AddProjectAlarmRuleObjRelDTO> convert2AddProjectAlarmRuleObjRelDTO(UpdateProjectAlarmRuleDTO updateProjectAlarmRuleDTO) {
|
|
|
|
- List<UpdateAlarmItemDTO> addRelationList = updateProjectAlarmRuleDTO.getAddRelationList();
|
|
|
|
|
|
+ private List<AddProjectAlarmRuleObjRelDTO> convert2AddProjectAlarmRuleObjRelDTO(List<UpdateAlarmItemDTO> addRelationList,String id,String projectId) {
|
|
List<AddProjectAlarmRuleObjRelDTO> list = new ArrayList<>();
|
|
List<AddProjectAlarmRuleObjRelDTO> list = new ArrayList<>();
|
|
- String projectId = updateProjectAlarmRuleDTO.getProjectId();
|
|
|
|
- String id = updateProjectAlarmRuleDTO.getId();
|
|
|
|
for (UpdateAlarmItemDTO updateAlarmItemDTO : addRelationList) {
|
|
for (UpdateAlarmItemDTO updateAlarmItemDTO : addRelationList) {
|
|
AddProjectAlarmRuleObjRelDTO addProjectAlarmRuleObjRelDTO = new AddProjectAlarmRuleObjRelDTO();
|
|
AddProjectAlarmRuleObjRelDTO addProjectAlarmRuleObjRelDTO = new AddProjectAlarmRuleObjRelDTO();
|
|
addProjectAlarmRuleObjRelDTO.setProjectAlarmRuleId(id);
|
|
addProjectAlarmRuleObjRelDTO.setProjectAlarmRuleId(id);
|