|
@@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
+import com.persagy.apm.alarmservice.common.util.DataUtils;
|
|
import com.persagy.apm.alarmservice.group.alarmrule.model.GroupAlarmRule;
|
|
import com.persagy.apm.alarmservice.group.alarmrule.model.GroupAlarmRule;
|
|
import com.persagy.apm.alarmservice.group.alarmrule.model.dto.AddGroupAlarmRuleDTO;
|
|
import com.persagy.apm.alarmservice.group.alarmrule.model.dto.AddGroupAlarmRuleDTO;
|
|
import com.persagy.apm.alarmservice.group.alarmrule.model.dto.QueryGroupAlarmRuleDTO;
|
|
import com.persagy.apm.alarmservice.group.alarmrule.model.dto.QueryGroupAlarmRuleDTO;
|
|
import com.persagy.apm.alarmservice.group.alarmrule.service.IGroupAlarmRuleService;
|
|
import com.persagy.apm.alarmservice.group.alarmrule.service.IGroupAlarmRuleService;
|
|
|
|
+import com.persagy.apm.alarmservice.group.management.model.equip.dto.QueryEquipDTO;
|
|
import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipItem;
|
|
import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipItem;
|
|
import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipListItem;
|
|
import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipListItem;
|
|
import com.persagy.apm.alarmservice.group.management.service.impl.GroupManagementServiceImpl;
|
|
import com.persagy.apm.alarmservice.group.management.service.impl.GroupManagementServiceImpl;
|
|
@@ -17,22 +19,20 @@ import com.persagy.apm.alarmservice.project.alarmcondition.service.IAlarmConditi
|
|
import com.persagy.apm.alarmservice.project.alarmrule.dao.ProjectAlarmRuleMapper;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.dao.ProjectAlarmRuleMapper;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.model.ConvertProjectAlarmRuleTool;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.model.ConvertProjectAlarmRuleTool;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.model.ProjectAlarmRule;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.model.ProjectAlarmRule;
|
|
-import com.persagy.apm.alarmservice.project.alarmrule.model.dto.AddProjectAlarmRuleDTO;
|
|
|
|
-import com.persagy.apm.alarmservice.project.alarmrule.model.dto.PageQueryProjectAlarmRuleDTO;
|
|
|
|
-import com.persagy.apm.alarmservice.project.alarmrule.model.dto.QueryProjectAlarmRuleDTO;
|
|
|
|
-import com.persagy.apm.alarmservice.project.alarmrule.model.dto.UpdateProjectAlarmRuleDTO;
|
|
|
|
|
|
+import com.persagy.apm.alarmservice.project.alarmrule.model.dto.*;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.service.IProjectAlarmRuleService;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.service.IProjectAlarmRuleService;
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.dto.AddProjectAlarmRuleObjRelDTO;
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.dto.AddProjectAlarmRuleObjRelDTO;
|
|
|
|
+import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.dto.QueryRuleObjRelDTO;
|
|
|
|
+import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.dto.UpdateAlarmItemDTO;
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.vo.ProjectVO;
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.vo.ProjectVO;
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.service.IProjectAlarmRuleObjRelService;
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.service.IProjectAlarmRuleObjRelService;
|
|
import com.persagy.apm.common.constant.enums.ValidEnum;
|
|
import com.persagy.apm.common.constant.enums.ValidEnum;
|
|
import com.persagy.apm.common.context.AppContext;
|
|
import com.persagy.apm.common.context.AppContext;
|
|
import com.persagy.apm.common.context.poems.PoemsContext;
|
|
import com.persagy.apm.common.context.poems.PoemsContext;
|
|
|
|
+import com.persagy.apm.energyalarmstarter.alarmdata.feign.DmpResult;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.AlarmCondition;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.AlarmCondition;
|
|
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.AddAlarmConfigDTO;
|
|
|
|
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.BatchAddAlarmConfigDTO;
|
|
|
|
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.BatchUpdateAlarmConfigDTO;
|
|
|
|
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.UpdateAlarmConfigDTO;
|
|
|
|
|
|
+import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.*;
|
|
|
|
+import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmConfigItem;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmConfigServiceImpl;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmConfigServiceImpl;
|
|
import org.apache.commons.io.IOUtils;
|
|
import org.apache.commons.io.IOUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
@@ -48,6 +48,7 @@ import java.util.ArrayList;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
import static org.apache.commons.lang3.math.NumberUtils.INTEGER_ONE;
|
|
import static org.apache.commons.lang3.math.NumberUtils.INTEGER_ONE;
|
|
|
|
|
|
@@ -83,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添加到项目规则表
|
|
@@ -97,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);
|
|
@@ -215,30 +221,38 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
projectAlarmRule.setAlarmConditionId((String) map.get("id"));
|
|
projectAlarmRule.setAlarmConditionId((String) map.get("id"));
|
|
}
|
|
}
|
|
//新增关联关系
|
|
//新增关联关系
|
|
- projectAlarmRuleObjRelService.createBatchRelation(updateProjectAlarmRuleDTO.getAddRelationList());
|
|
|
|
|
|
+ List<UpdateAlarmItemDTO> addRelationList = updateProjectAlarmRuleDTO.getAddRelationList();
|
|
|
|
+ String projectId = updateProjectAlarmRuleDTO.getProjectId();
|
|
|
|
+ String id = updateProjectAlarmRuleDTO.getId();
|
|
|
|
+ List<AddProjectAlarmRuleObjRelDTO> addRelations = convert2AddProjectAlarmRuleObjRelDTO(addRelationList,id,projectId);
|
|
|
|
+ projectAlarmRuleObjRelService.createBatchRelation(addRelations);
|
|
|
|
|
|
//同步更新设备报警条件 begin
|
|
//同步更新设备报警条件 begin
|
|
- BatchUpdateAlarmConfigDTO batchUpdateAlarmConfigDTO = new BatchUpdateAlarmConfigDTO();
|
|
|
|
- List<UpdateAlarmConfigDTO> updateAlarmConfigDTOs = new ArrayList();
|
|
|
|
- String condition = updateProjectAlarmRuleDTO.getCondition();
|
|
|
|
- String classCode = updateProjectAlarmRuleDTO.getClassCode();
|
|
|
|
- List<EquipItem> records = groupManagementService.getEquipList(condition, classCode);
|
|
|
|
- Map<String, Object> stringMap = alarmConditionService.frontend2Backend(alarmCondition.getFrontend());
|
|
|
|
- for (EquipItem record : records) {
|
|
|
|
- AlarmCondition alarmCondit = new AlarmCondition();
|
|
|
|
- alarmCondit.setTrigger(alarmCondition.getBackend());
|
|
|
|
- List<String> infoCodeList = alarmCondition.getInfoCodes();
|
|
|
|
- alarmCondit.setInfoCode(infoCodeList);
|
|
|
|
- alarmCondit.setTriggerUphold(alarmCondition.getTriggerUphold());
|
|
|
|
- alarmCondit.setRules((List<String>) stringMap.get("displayFormula"));
|
|
|
|
- UpdateAlarmConfigDTO updateAlarmConfigDTO = new UpdateAlarmConfigDTO();
|
|
|
|
- updateAlarmConfigDTO.setCondition(alarmCondit);
|
|
|
|
- updateAlarmConfigDTO.setId(record.getId());
|
|
|
|
- updateAlarmConfigDTO.setLevel(alarmCondition.getAlarmLevel());
|
|
|
|
- updateAlarmConfigDTOs.add(updateAlarmConfigDTO);
|
|
|
|
- }
|
|
|
|
- batchUpdateAlarmConfigDTO.setAlarmConfigs(updateAlarmConfigDTOs);
|
|
|
|
- alarmConfigService.batchUpdate(batchUpdateAlarmConfigDTO);
|
|
|
|
|
|
+// BatchUpdateAlarmConfigDTO batchUpdateAlarmConfigDTO = new BatchUpdateAlarmConfigDTO();
|
|
|
|
+// List<UpdateAlarmConfigDTO> updateAlarmConfigDTOs = new ArrayList();
|
|
|
|
+// String condition = updateProjectAlarmRuleDTO.getCondition();
|
|
|
|
+// String classCode = updateProjectAlarmRuleDTO.getClassCode();
|
|
|
|
+// QueryEquipDTO queryEquipDTO = new QueryEquipDTO();
|
|
|
|
+// queryEquipDTO.setProjectId(projectId);
|
|
|
|
+// queryEquipDTO.setClassCode(classCode);
|
|
|
|
+// queryEquipDTO.setCondition(condition);
|
|
|
|
+// List<EquipItem> records = groupManagementService.getEquipList(queryEquipDTO);
|
|
|
|
+// Map<String, Object> stringMap = alarmConditionService.frontend2Backend(alarmCondition.getFrontend());
|
|
|
|
+// for (EquipItem record : records) {
|
|
|
|
+// AlarmCondition alarmCondit = new AlarmCondition();
|
|
|
|
+// alarmCondit.setTrigger(alarmCondition.getBackend());
|
|
|
|
+// List<String> infoCodeList = alarmCondition.getInfoCodes();
|
|
|
|
+// alarmCondit.setInfoCode(infoCodeList);
|
|
|
|
+// alarmCondit.setTriggerUphold(alarmCondition.getTriggerUphold());
|
|
|
|
+// alarmCondit.setRules((List<String>) stringMap.get("displayFormula"));
|
|
|
|
+// UpdateAlarmConfigDTO updateAlarmConfigDTO = new UpdateAlarmConfigDTO();
|
|
|
|
+// updateAlarmConfigDTO.setCondition(alarmCondit);
|
|
|
|
+// updateAlarmConfigDTO.setId(record.getId());
|
|
|
|
+// updateAlarmConfigDTO.setLevel(alarmCondition.getAlarmLevel());
|
|
|
|
+// updateAlarmConfigDTOs.add(updateAlarmConfigDTO);
|
|
|
|
+// }
|
|
|
|
+// batchUpdateAlarmConfigDTO.setAlarmConfigs(updateAlarmConfigDTOs);
|
|
|
|
+// alarmConfigService.batchUpdate(batchUpdateAlarmConfigDTO);
|
|
//同步更新设备报警条件 end
|
|
//同步更新设备报警条件 end
|
|
}
|
|
}
|
|
//更新项目报警
|
|
//更新项目报警
|
|
@@ -249,6 +263,20 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ private List<AddProjectAlarmRuleObjRelDTO> convert2AddProjectAlarmRuleObjRelDTO(List<UpdateAlarmItemDTO> addRelationList,String id,String projectId) {
|
|
|
|
+ List<AddProjectAlarmRuleObjRelDTO> list = new ArrayList<>();
|
|
|
|
+ for (UpdateAlarmItemDTO updateAlarmItemDTO : addRelationList) {
|
|
|
|
+ AddProjectAlarmRuleObjRelDTO addProjectAlarmRuleObjRelDTO = new AddProjectAlarmRuleObjRelDTO();
|
|
|
|
+ addProjectAlarmRuleObjRelDTO.setProjectAlarmRuleId(id);
|
|
|
|
+ addProjectAlarmRuleObjRelDTO.setObjId(updateAlarmItemDTO.getObjId());
|
|
|
|
+ addProjectAlarmRuleObjRelDTO.setProjectId(projectId);
|
|
|
|
+ addProjectAlarmRuleObjRelDTO.setOpen(1);
|
|
|
|
+ addProjectAlarmRuleObjRelDTO.setObjName(updateAlarmItemDTO.getObjName());
|
|
|
|
+ list.add(addProjectAlarmRuleObjRelDTO);
|
|
|
|
+ }
|
|
|
|
+ return list;
|
|
|
|
+ }
|
|
|
|
+
|
|
public String getConditionId(String alarmItemCode) {
|
|
public String getConditionId(String alarmItemCode) {
|
|
//查询对应报警类型的集团规则,将ID添加到项目规则表
|
|
//查询对应报警类型的集团规则,将ID添加到项目规则表
|
|
QueryGroupAlarmRuleDTO queryAlarmConditionDTO = new QueryGroupAlarmRuleDTO();
|
|
QueryGroupAlarmRuleDTO queryAlarmConditionDTO = new QueryGroupAlarmRuleDTO();
|
|
@@ -283,15 +311,14 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
/**
|
|
/**
|
|
* 删除项目报警规则
|
|
* 删除项目报警规则
|
|
*
|
|
*
|
|
- * @param id 主键
|
|
|
|
* @author lixing
|
|
* @author lixing
|
|
* @version V1.0 2021-09-08 22:46:16
|
|
* @version V1.0 2021-09-08 22:46:16
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
- public void deleteProjectAlarmRule(String id) {
|
|
|
|
|
|
+ public void deleteProjectAlarmRule(DeleteProjectAlarmRuleDTO deleteProjectAlarmRuleDTO) throws Exception {
|
|
// 校验是否可删除
|
|
// 校验是否可删除
|
|
- ProjectAlarmRule projectAlarmRule = checkDeletable(id);
|
|
|
|
|
|
+ ProjectAlarmRule projectAlarmRule = checkDeletable(deleteProjectAlarmRuleDTO.getId());
|
|
projectAlarmRule.setValid(ValidEnum.FALSE.getType());
|
|
projectAlarmRule.setValid(ValidEnum.FALSE.getType());
|
|
updateById(projectAlarmRule);
|
|
updateById(projectAlarmRule);
|
|
//查询是否是自定义报警,是则删除自定义规则
|
|
//查询是否是自定义报警,是则删除自定义规则
|
|
@@ -301,6 +328,40 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
}
|
|
}
|
|
//删除项目报警规则与监测对象的关联
|
|
//删除项目报警规则与监测对象的关联
|
|
projectAlarmRuleObjRelService.deleteRelation(projectAlarmRule.getProjectId());
|
|
projectAlarmRuleObjRelService.deleteRelation(projectAlarmRule.getProjectId());
|
|
|
|
+ //删除设备报警条件 begin
|
|
|
|
+ BatchDeleteAlarmConfigDTO batchDeleteAlarmConfigDTO = new BatchDeleteAlarmConfigDTO();
|
|
|
|
+ List<DeleteAlarmConfigDTO> alarmConfigs = new ArrayList<>();
|
|
|
|
+ String condition = deleteProjectAlarmRuleDTO.getCondition();
|
|
|
|
+ String classCode = deleteProjectAlarmRuleDTO.getClassCode();
|
|
|
|
+ String projectId = deleteProjectAlarmRuleDTO.getProjectId();
|
|
|
|
+ //查询所有设备
|
|
|
|
+ List<EquipItem> equips = this.getAllEquip(classCode, condition, projectId);
|
|
|
|
+ List<String> objIds = equips.stream().map(EquipItem::getId).collect(Collectors.toList());
|
|
|
|
+ QueryAlarmConfigDTO queryAlarmConfigDTO = new QueryAlarmConfigDTO();
|
|
|
|
+ queryAlarmConfigDTO.setObjId(objIds);
|
|
|
|
+ DmpResult<List<AlarmConfigItem>> query = alarmConfigService.query(queryAlarmConfigDTO);
|
|
|
|
+ //所有设备条件
|
|
|
|
+ List<AlarmConfigItem> data = query.getData();
|
|
|
|
+ //组织删除参数
|
|
|
|
+ if (data.size() > 0) {
|
|
|
|
+ data.forEach(alarmConfigItem -> {
|
|
|
|
+ DeleteAlarmConfigDTO deleteAlarmConfigDTO = new DeleteAlarmConfigDTO();
|
|
|
|
+ deleteAlarmConfigDTO.setId(alarmConfigItem.getId());
|
|
|
|
+ alarmConfigs.add(deleteAlarmConfigDTO);
|
|
|
|
+ });
|
|
|
|
+ batchDeleteAlarmConfigDTO.setAlarmConfigs(alarmConfigs);
|
|
|
|
+ alarmConfigService.batchDelete(batchDeleteAlarmConfigDTO);
|
|
|
|
+ }
|
|
|
|
+ //删除设备报警条件 end
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private List<EquipItem> getAllEquip(String classCode, String condition, String projectId) {
|
|
|
|
+ QueryEquipDTO queryEquipDTO = new QueryEquipDTO();
|
|
|
|
+ queryEquipDTO.setProjectId(projectId);
|
|
|
|
+ queryEquipDTO.setClassCode(classCode);
|
|
|
|
+ queryEquipDTO.setCondition(condition);
|
|
|
|
+ List<EquipItem> record = groupManagementService.getEquipList(queryEquipDTO);
|
|
|
|
+ return record;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -406,9 +467,17 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
public List<AddProjectAlarmRuleObjRelDTO> addProjectAlarmRules(AddGroupAlarmRuleDTO addGroupAlarmRuleDTO) {
|
|
public List<AddProjectAlarmRuleObjRelDTO> addProjectAlarmRules(AddGroupAlarmRuleDTO addGroupAlarmRuleDTO) {
|
|
String condition = addGroupAlarmRuleDTO.getCondition();
|
|
String condition = addGroupAlarmRuleDTO.getCondition();
|
|
String classCode = addGroupAlarmRuleDTO.getClassCode();
|
|
String classCode = addGroupAlarmRuleDTO.getClassCode();
|
|
- List<EquipItem> records = groupManagementService.getEquipList(condition, classCode);
|
|
|
|
//查询所有项目
|
|
//查询所有项目
|
|
List<ProjectVO> projects = this.getProject();
|
|
List<ProjectVO> projects = this.getProject();
|
|
|
|
+ List<EquipItem> records = new ArrayList<>();
|
|
|
|
+ for (ProjectVO project : projects) {
|
|
|
|
+ QueryEquipDTO queryEquipDTO = new QueryEquipDTO();
|
|
|
|
+ queryEquipDTO.setProjectId(project.getProjectId());
|
|
|
|
+ queryEquipDTO.setClassCode(classCode);
|
|
|
|
+ queryEquipDTO.setCondition(condition);
|
|
|
|
+ List<EquipItem> record = groupManagementService.getEquipList(queryEquipDTO);
|
|
|
|
+ records.addAll(record);
|
|
|
|
+ }
|
|
//遍历项目,组好对象进行插入
|
|
//遍历项目,组好对象进行插入
|
|
List<ProjectAlarmRule> projectAlarmRuleList = new ArrayList<>();
|
|
List<ProjectAlarmRule> projectAlarmRuleList = new ArrayList<>();
|
|
String alarmItemCode = addGroupAlarmRuleDTO.getAlarmItemCode();
|
|
String alarmItemCode = addGroupAlarmRuleDTO.getAlarmItemCode();
|
|
@@ -421,23 +490,24 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
projectAlarmRule.setAlarmItemName(alarmItemName);
|
|
projectAlarmRule.setAlarmItemName(alarmItemName);
|
|
projectAlarmRule.setBelong(INTEGER_ONE);
|
|
projectAlarmRule.setBelong(INTEGER_ONE);
|
|
projectAlarmRule.setGroupId(addGroupAlarmRuleDTO.getGroupId());
|
|
projectAlarmRule.setGroupId(addGroupAlarmRuleDTO.getGroupId());
|
|
|
|
+ projectAlarmRule.setId(DataUtils.getUUID());
|
|
String conditionId = getConditionId(alarmItemCode);
|
|
String conditionId = getConditionId(alarmItemCode);
|
|
projectAlarmRule.setAlarmConditionId(conditionId);
|
|
projectAlarmRule.setAlarmConditionId(conditionId);
|
|
setDefaultValue(projectAlarmRule);
|
|
setDefaultValue(projectAlarmRule);
|
|
projectAlarmRuleList.add(projectAlarmRule);
|
|
projectAlarmRuleList.add(projectAlarmRule);
|
|
//新增关联关系
|
|
//新增关联关系
|
|
- records.forEach(groupManagementVo -> {
|
|
|
|
|
|
+ for (EquipItem record : records) {
|
|
AddProjectAlarmRuleObjRelDTO addProjectAlarmRuleObjRelDTO = new AddProjectAlarmRuleObjRelDTO();
|
|
AddProjectAlarmRuleObjRelDTO addProjectAlarmRuleObjRelDTO = new AddProjectAlarmRuleObjRelDTO();
|
|
addProjectAlarmRuleObjRelDTO.setProjectAlarmRuleId(projectAlarmRule.getId());
|
|
addProjectAlarmRuleObjRelDTO.setProjectAlarmRuleId(projectAlarmRule.getId());
|
|
addProjectAlarmRuleObjRelDTO.setProjectId(project.getProjectId());
|
|
addProjectAlarmRuleObjRelDTO.setProjectId(project.getProjectId());
|
|
- addProjectAlarmRuleObjRelDTO.setEquipId(groupManagementVo.getId());
|
|
|
|
|
|
+ addProjectAlarmRuleObjRelDTO.setObjId(record.getId());
|
|
|
|
+ addProjectAlarmRuleObjRelDTO.setObjName(record.getName());
|
|
addProjectAlarmRuleObjRelDTO.setOpen(INTEGER_ONE);
|
|
addProjectAlarmRuleObjRelDTO.setOpen(INTEGER_ONE);
|
|
addRelationList.add(addProjectAlarmRuleObjRelDTO);
|
|
addRelationList.add(addProjectAlarmRuleObjRelDTO);
|
|
- });
|
|
|
|
|
|
+ }
|
|
}
|
|
}
|
|
projectAlarmRuleObjRelService.createBatchRelation(addRelationList);
|
|
projectAlarmRuleObjRelService.createBatchRelation(addRelationList);
|
|
saveBatch(projectAlarmRuleList);
|
|
saveBatch(projectAlarmRuleList);
|
|
-
|
|
|
|
return addRelationList;
|
|
return addRelationList;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -456,4 +526,14 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
throw new RuntimeException("json文件有误", ioe);
|
|
throw new RuntimeException("json文件有误", ioe);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public List<String> queryAlarmRule(QueryRuleObjRelDTO queryRuleObjRelDTO) {
|
|
|
|
+ QueryWrapper<ProjectAlarmRule> queryWrapper = new QueryWrapper<>();
|
|
|
|
+ queryWrapper.eq(ProjectAlarmRule.PROP_GROUP_ID, queryRuleObjRelDTO.getGroupId());
|
|
|
|
+ queryWrapper.eq(ProjectAlarmRule.PROP_ALARM_ITEM_CODE, queryRuleObjRelDTO.getAlarmItemCode());
|
|
|
|
+ List<ProjectAlarmRule> list = list(queryWrapper);
|
|
|
|
+ List<String> idList = list.stream().map(ProjectAlarmRule::getId).collect(Collectors.toList());
|
|
|
|
+ return idList;
|
|
|
|
+ }
|
|
}
|
|
}
|