manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔨 修改配置.

Browse Source
This commit is contained in:
lijiahangmax
2025-09-25 11:31:57 +08:00
parent 364120c143
commit 24ad1f64df
85 changed files with 449 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyRuleServiceImpl.java
View File

@@ -27,7 +27,7 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
import org.dromara.visor.framework.mybatis.core.query.Conditions;
import org.dromara.visor.framework.mybatis.core.utils.DomainFillUtils;
@@ -81,10 +81,10 @@ public class AlarmPolicyRuleServiceImpl implements AlarmPolicyRuleService {
log.info("AlarmPolicyRuleService-createAlarmPolicyRule request: {}", JSON.toJSONString(request));
// 检查指标是否存在
MonitorMetricsDO metrics = monitorMetricsDAO.selectById(request.getMetricsId());
Valid.notNull(metrics, ErrorMessage.METRICS_ABSENT);
Assert.notNull(metrics, ErrorMessage.METRICS_ABSENT);
// 检查告警策略是否存在
AlarmPolicyDO alarmPolicy = alarmPolicyDAO.selectById(request.getPolicyId());
Valid.notNull(alarmPolicy, ErrorMessage.ALARM_POLICY_ABSENT);
Assert.notNull(alarmPolicy, ErrorMessage.ALARM_POLICY_ABSENT);
// 转换
AlarmPolicyRuleDO record = AlarmPolicyRuleConvert.MAPPER.to(request);
record.setMetricsMeasurement(metrics.getMeasurement());
@@ -102,14 +102,14 @@ public class AlarmPolicyRuleServiceImpl implements AlarmPolicyRuleService {
@Override
@Transactional(rollbackFor = Exception.class)
public Integer updateAlarmPolicyRuleById(AlarmPolicyRuleUpdateRequest request) {
Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING);
Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING);
log.info("AlarmPolicyRuleService-updateAlarmPolicyRuleById id: {}, request: {}", id, JSON.toJSONString(request));
// 检查指标是否存在
MonitorMetricsDO metrics = monitorMetricsDAO.selectById(request.getMetricsId());
Valid.notNull(metrics, ErrorMessage.METRICS_ABSENT);
Assert.notNull(metrics, ErrorMessage.METRICS_ABSENT);
// 查询
AlarmPolicyRuleDO record = alarmPolicyRuleDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 转换
AlarmPolicyRuleDO updateRecord = AlarmPolicyRuleConvert.MAPPER.to(request);
updateRecord.setMetricsMeasurement(metrics.getMeasurement());
@@ -128,7 +128,7 @@ public class AlarmPolicyRuleServiceImpl implements AlarmPolicyRuleService {
log.info("AlarmPolicyRuleService-updateAlarmPolicyRuleSwitch id: {}, request: {}", id, JSON.toJSONString(request));
// 查询
AlarmPolicyRuleDO record = alarmPolicyRuleDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 设置日志参数
OperatorLogs.add(OperatorLogs.SWITCH, switchEnum.name());
// 更新

16
orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java
View File

@@ -28,7 +28,7 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
import org.dromara.visor.framework.redis.core.utils.RedisMaps;
import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers;
@@ -121,11 +121,11 @@ public class AlarmPolicyServiceImpl implements AlarmPolicyService {
@Override
@Transactional(rollbackFor = Exception.class)
public Long copyAlarmPolicy(AlarmPolicyCopyRequest request) {
Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING);
Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING);
log.info("AlarmPolicyService-copyAlarmPolicy id: {}, request: {}", id, JSON.toJSONString(request));
// 查询
AlarmPolicyDO record = alarmPolicyDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 创建策略
Long newId = this.createAlarmPolicy(request);
// 复制策略规则
@@ -136,11 +136,11 @@ public class AlarmPolicyServiceImpl implements AlarmPolicyService {
@Override
@Transactional(rollbackFor = Exception.class)
public Integer updateAlarmPolicyById(AlarmPolicyUpdateRequest request) {
Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING);
Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING);
log.info("AlarmPolicyService-updateAlarmPolicyById id: {}, request: {}", id, JSON.toJSONString(request));
// 查询
AlarmPolicyDO record = alarmPolicyDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 转换
AlarmPolicyDO updateRecord = AlarmPolicyConvert.MAPPER.to(request);
// 查询数据是否冲突
@@ -161,7 +161,7 @@ public class AlarmPolicyServiceImpl implements AlarmPolicyService {
public AlarmPolicyVO getAlarmPolicyById(Long id) {
// 查询
AlarmPolicyDO record = alarmPolicyDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 查询通知策略
List<Long> notifyIdList = alarmPolicyNotifyService.getAlarmPolicyNotify(id);
// 转换
@@ -238,7 +238,7 @@ public class AlarmPolicyServiceImpl implements AlarmPolicyService {
log.info("AlarmPolicyService-deleteAlarmPolicyById id: {}", id);
// 查询数据
AlarmPolicyDO record = alarmPolicyDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 删除主表
int effect = alarmPolicyDAO.deleteById(id);
// 设置日志参数
@@ -277,7 +277,7 @@ public class AlarmPolicyServiceImpl implements AlarmPolicyService {
.eq(AlarmPolicyDO::getName, domain.getName());
// 检查是否存在
boolean present = alarmPolicyDAO.of(wrapper).present();
Valid.isFalse(present, ErrorMessage.DATA_PRESENT);
Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
}
}

4
orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorAgentEndpointServiceImpl.java
View File

@@ -32,8 +32,8 @@ import com.influxdb.client.write.Point;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.common.utils.LockerUtils;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.framework.influxdb.core.utils.InfluxdbUtils;
import org.dromara.visor.module.asset.api.HostApi;
import org.dromara.visor.module.asset.entity.dto.host.HostDTO;
@@ -112,7 +112,7 @@ public class MonitorAgentEndpointServiceImpl implements MonitorAgentEndpointServ
Executable exec = () -> {
// 查询主机是否存在
HostDTO host = hostApi.selectByAgentKey(agentKey);
Valid.notNull(host, ErrorMessage.HOST_ABSENT);
Assert.notNull(host, ErrorMessage.HOST_ABSENT);
// 查询数据
MonitorHostDO monitorHost = monitorHostDAO.selectByAgentKey(agentKey);
MonitorHostConfigDTO newConfig = null;

18
orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorHostServiceImpl.java
View File

@@ -35,7 +35,7 @@ import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.constant.ExtraFieldConst;
import org.dromara.visor.common.entity.chart.TimeChartSeries;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
import org.dromara.visor.framework.influxdb.core.query.FluxQueryBuilder;
import org.dromara.visor.framework.influxdb.core.utils.InfluxdbUtils;
@@ -238,15 +238,15 @@ public class MonitorHostServiceImpl implements MonitorHostService {
@Override
@Transactional(rollbackFor = Exception.class)
public Integer updateMonitorHostById(MonitorHostUpdateRequest request) {
Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING);
Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING);
Long policyId = request.getPolicyId();
log.info("MonitorHostService-updateMonitorHostById id: {}, request: {}", id, JSON.toJSONString(request));
// 查询数据
MonitorHostDO monitorHost = monitorHostDAO.selectById(id);
Valid.notNull(monitorHost, ErrorMessage.DATA_ABSENT);
Assert.notNull(monitorHost, ErrorMessage.DATA_ABSENT);
// 查询主机信息
HostDTO host = hostApi.selectById(monitorHost.getHostId());
Valid.notNull(host, ErrorMessage.HOST_ABSENT);
Assert.notNull(host, ErrorMessage.HOST_ABSENT);
// 查询用户信息
Optional.ofNullable(request.getOwnerUserId())
.map(systemUserApi::getUsernameById)
@@ -255,7 +255,7 @@ public class MonitorHostServiceImpl implements MonitorHostService {
OperatorLogs.add(OperatorLogs.NAME, host.getName());
// 查询策略是否存在
if (policyId != null) {
Valid.notNull(alarmPolicyDAO.selectById(policyId), ErrorMessage.ALARM_POLICY_ABSENT);
Assert.notNull(alarmPolicyDAO.selectById(policyId), ErrorMessage.ALARM_POLICY_ABSENT);
}
// 转换
MonitorHostDO updateRecord = MonitorHostConvert.MAPPER.to(request);
@@ -285,10 +285,10 @@ public class MonitorHostServiceImpl implements MonitorHostService {
AlarmSwitchEnum alarmSwitch = AlarmSwitchEnum.of(request.getAlarmSwitch());
// 查询数据
List<MonitorHostDO> monitorHostList = monitorHostDAO.selectBatchIds(idList);
Valid.notEmpty(monitorHostList, ErrorMessage.DATA_ABSENT);
Assert.notEmpty(monitorHostList, ErrorMessage.DATA_ABSENT);
// 查询主机信息
List<HostDTO> hostList = hostApi.selectByIdList(Lists.map(monitorHostList, MonitorHostDO::getHostId));
Valid.notEmpty(hostList, ErrorMessage.HOST_ABSENT);
Assert.notEmpty(hostList, ErrorMessage.HOST_ABSENT);
// 设置日志参数
OperatorLogs.add(OperatorLogs.COUNT, hostList.size());
OperatorLogs.add(OperatorLogs.SWITCH, alarmSwitch.name());
@@ -370,8 +370,8 @@ public class MonitorHostServiceImpl implements MonitorHostService {
if (range != null) {
query.range(range);
} else {
Valid.notNull(request.getStart(), ErrorMessage.PARAM_MISSING);
Valid.notNull(request.getEnd(), ErrorMessage.PARAM_MISSING);
Assert.notNull(request.getStart(), ErrorMessage.PARAM_MISSING);
Assert.notNull(request.getEnd(), ErrorMessage.PARAM_MISSING);
}
// 设置名称
Set<String> names = null;

10
orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java
View File

@@ -27,7 +27,7 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
import org.dromara.visor.framework.redis.core.utils.RedisMaps;
import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers;
@@ -96,11 +96,11 @@ public class MonitorMetricsServiceImpl implements MonitorMetricsService {
@Override
@Transactional(rollbackFor = Exception.class)
public Integer updateMonitorMetricsById(MonitorMetricsUpdateRequest request) {
Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING);
Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING);
log.info("MonitorMetricsService-updateMonitorMetricsById id: {}, request: {}", id, JSON.toJSONString(request));
// 查询
MonitorMetricsDO record = monitorMetricsDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 转换
MonitorMetricsDO updateRecord = MonitorMetricsConvert.MAPPER.to(request);
updateRecord.setMeasurement(record.getMeasurement());
@@ -164,7 +164,7 @@ public class MonitorMetricsServiceImpl implements MonitorMetricsService {
log.info("MonitorMetricsService-deleteMonitorMetricsById id: {}", id);
// 检查数据是否存在
MonitorMetricsDO record = monitorMetricsDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 删除
int effect = monitorMetricsDAO.deleteById(id);
// 删除规则
@@ -203,7 +203,7 @@ public class MonitorMetricsServiceImpl implements MonitorMetricsService {
.eq(MonitorMetricsDO::getValue, domain.getValue());
// 检查是否存在
boolean present = monitorMetricsDAO.of(wrapper).present();
Valid.isFalse(present, ErrorMessage.DATA_PRESENT);
Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
}
}