diff --git a/orion-visor-launch/src/main/resources/application-dev.yaml b/orion-visor-launch/src/main/resources/application-dev.yaml index 312c7a46..a448b939 100644 --- a/orion-visor-launch/src/main/resources/application-dev.yaml +++ b/orion-visor-launch/src/main/resources/application-dev.yaml @@ -1,7 +1,7 @@ spring: datasource: druid: - url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:orion_visor}?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true + url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:orion_visor}?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true&useServerPrepStmts=false username: ${MYSQL_USER:root} password: ${MYSQL_PASSWORD:Data@123456} initial-size: 0 diff --git a/orion-visor-launch/src/main/resources/application-prod.yaml b/orion-visor-launch/src/main/resources/application-prod.yaml index c6cf2897..e9c8619e 100644 --- a/orion-visor-launch/src/main/resources/application-prod.yaml +++ b/orion-visor-launch/src/main/resources/application-prod.yaml @@ -1,7 +1,7 @@ spring: datasource: druid: - url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:orion_visor}?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true + url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:orion_visor}?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true&useServerPrepStmts=false username: ${MYSQL_USER:root} password: ${MYSQL_PASSWORD:Data@123456} # 初始连接数 diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/convert/AlarmEventConvert.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/convert/AlarmEventConvert.java index 17cf1559..02ff51e9 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/convert/AlarmEventConvert.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/convert/AlarmEventConvert.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.monitor.convert; import org.dromara.visor.module.monitor.entity.domain.AlarmEventDO; import org.dromara.visor.module.monitor.entity.dto.AlarmEventTriggerDTO; import org.dromara.visor.module.monitor.entity.dto.AlarmPolicyAlarmCountDTO; -import org.dromara.visor.module.monitor.entity.po.AlarmPolicyAlarmCountPO; +import org.dromara.visor.module.monitor.entity.po.AlarmEventCountPO; import org.dromara.visor.module.monitor.entity.request.alarm.AlarmEventQueryRequest; import org.dromara.visor.module.monitor.entity.vo.AlarmEventVO; import org.mapstruct.Mapper; @@ -51,7 +51,7 @@ public interface AlarmEventConvert { AlarmEventTriggerDTO toTrigger(AlarmEventDO domain); - AlarmPolicyAlarmCountDTO toCount(AlarmPolicyAlarmCountPO domain); + AlarmPolicyAlarmCountDTO toCount(AlarmEventCountPO domain); List to(List list); diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/dao/AlarmEventDAO.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/dao/AlarmEventDAO.java index ff3544d6..723e56ce 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/dao/AlarmEventDAO.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/dao/AlarmEventDAO.java @@ -26,7 +26,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.dromara.visor.framework.mybatis.core.mapper.IMapper; import org.dromara.visor.module.monitor.entity.domain.AlarmEventDO; -import org.dromara.visor.module.monitor.entity.po.AlarmPolicyRuleCountPO; +import org.dromara.visor.module.monitor.entity.po.AlarmEventCountPO; import java.util.Date; import java.util.List; @@ -49,8 +49,8 @@ public interface AlarmEventDAO extends IMapper { * @param createTimeEnd createTimeEnd * @return count */ - List selectPolicyEventCount(@Param("policyIdList") List policyIdList, - @Param("createTimeStart") Date createTimeStart, - @Param("createTimeEnd") Date createTimeEnd); + List selectPolicyEventCount(@Param("policyIdList") List policyIdList, + @Param("createTimeStart") Date createTimeStart, + @Param("createTimeEnd") Date createTimeEnd); } diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/po/AlarmPolicyAlarmCountPO.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/po/AlarmEventCountPO.java similarity index 90% rename from orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/po/AlarmPolicyAlarmCountPO.java rename to orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/po/AlarmEventCountPO.java index 65658320..25ba477e 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/po/AlarmPolicyAlarmCountPO.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/po/AlarmEventCountPO.java @@ -41,8 +41,8 @@ import java.io.Serializable; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "AlarmPolicyAlarmCountPO", description = "监控告警事件数量对象") -public class AlarmPolicyAlarmCountPO implements Serializable { +@Schema(name = "AlarmEventCountPO", description = "监控告警事件数量对象") +public class AlarmEventCountPO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmEventServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmEventServiceImpl.java index 9d91224a..612ac92d 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmEventServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmEventServiceImpl.java @@ -43,7 +43,7 @@ import org.dromara.visor.module.monitor.dao.AlarmEventDAO; import org.dromara.visor.module.monitor.define.cache.AlarmEventCacheKeyDefine; import org.dromara.visor.module.monitor.entity.domain.AlarmEventDO; import org.dromara.visor.module.monitor.entity.dto.AlarmPolicyAlarmCountDTO; -import org.dromara.visor.module.monitor.entity.po.AlarmPolicyRuleCountPO; +import org.dromara.visor.module.monitor.entity.po.AlarmEventCountPO; import org.dromara.visor.module.monitor.entity.request.alarm.AlarmEventClearRequest; import org.dromara.visor.module.monitor.entity.request.alarm.AlarmEventHandleRequest; import org.dromara.visor.module.monitor.entity.request.alarm.AlarmEventQueryRequest; @@ -198,7 +198,7 @@ public class AlarmEventServiceImpl implements AlarmEventService { if (!queryIdList.isEmpty()) { Map countMap = alarmEventDAO.selectPolicyEventCount(queryIdList, startDate, endDate) .stream() - .collect(Collectors.toMap(AlarmPolicyRuleCountPO::getPolicyId, AlarmPolicyRuleCountPO::getCount)); + .collect(Collectors.toMap(AlarmEventCountPO::getPolicyId, AlarmEventCountPO::getCount)); // 设置缓存 for (Long policyId : queryIdList) { Integer count = Objects1.def(countMap.get(policyId), 0); diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/resources/mapper/AlarmEventMapper.xml b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/resources/mapper/AlarmEventMapper.xml index 2fedaf31..27d2f526 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/resources/mapper/AlarmEventMapper.xml +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/resources/mapper/AlarmEventMapper.xml @@ -34,7 +34,7 @@ - + @@ -48,6 +48,7 @@ SELECT policy_id, COUNT(1) total_count FROM monitor_alarm_event WHERE deleted = 0 + AND false_alarm = 0 AND policy_id IN #{item}