|
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.persagy.apm.alarmservice.common.jms.JmsSender;
|
|
|
import com.persagy.apm.alarmservice.common.util.DataUtils;
|
|
|
+import com.persagy.apm.alarmservice.dependency.saasweb.service.SaasWebClientWrapper;
|
|
|
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.GetGroupAlarmRuleDTO;
|
|
@@ -40,6 +41,7 @@ import com.persagy.apm.common.constant.enums.ValidEnum;
|
|
|
import com.persagy.apm.common.context.AppContext;
|
|
|
import com.persagy.apm.common.context.poems.PoemsContext;
|
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmConfigServiceImpl;
|
|
|
+import lombok.SneakyThrows;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -79,6 +81,8 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
|
private JmsSender jmsSender;
|
|
|
@Autowired
|
|
|
private ProjectAlarmRuleObjRelMapper projectAlarmRuleObjRelMapper;
|
|
|
+ @Autowired
|
|
|
+ private SaasWebClientWrapper saasWebClientWrapper;
|
|
|
|
|
|
/**
|
|
|
* 创建项目报警规则
|
|
@@ -501,8 +505,14 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ @SneakyThrows
|
|
|
public List<ProjectVO> getProject() {
|
|
|
- return mapper.getProject();
|
|
|
+ // 先从业务中台自己的项目表中拿数据,如果表中没有数据,使用运维平台的项目
|
|
|
+ List<ProjectVO> projects = mapper.getProject();
|
|
|
+ if (CollectionUtils.isEmpty(projects)) {
|
|
|
+ projects = saasWebClientWrapper.queryProjectList(PoemsContext.getContext().getGroupCode());
|
|
|
+ }
|
|
|
+ return projects;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -597,12 +607,12 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
|
// 压测模拟的设备数量
|
|
|
int equipCount = 2000;
|
|
|
for (int i = 100; i < equipCount; i++) {
|
|
|
- String objId = i+"-"+UUID.randomUUID().toString().replace("-","");
|
|
|
+ String objId = project.getProjectId()+"-"+i;
|
|
|
AddProjectAlarmRuleObjRelDTO addProjectAlarmRuleObjRelDTO = new AddProjectAlarmRuleObjRelDTO();
|
|
|
addProjectAlarmRuleObjRelDTO.setProjectAlarmRuleId(projectAlarmRule.getId());
|
|
|
addProjectAlarmRuleObjRelDTO.setProjectId(project.getProjectId());
|
|
|
addProjectAlarmRuleObjRelDTO.setObjId(objId);
|
|
|
- addProjectAlarmRuleObjRelDTO.setObjName("设备名称AAA");
|
|
|
+ addProjectAlarmRuleObjRelDTO.setObjName("设备名称" + objId);
|
|
|
addProjectAlarmRuleObjRelDTO.setOpen(INTEGER_ONE);
|
|
|
addRelationList.add(addProjectAlarmRuleObjRelDTO);
|
|
|
}
|