OpenSource/hertzbeat
Public Access
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[monitor]数据库实体对象类迁移到common包

Browse Source
This commit is contained in:
tomsun28
2022-01-30 12:11:10 +08:00
parent ba5563bca5
commit 89e48395cf
42 changed files with 55 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
alerter/src/main/java/com/usthe/alert/AlerterDataQueue.java
View File

@@ -1,6 +1,6 @@
package com.usthe.alert;
import com.usthe.alert.pojo.entity.Alert;
import com.usthe.common.entity.alerter.Alert;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

4
alerter/src/main/java/com/usthe/alert/calculate/CalculateAlarm.java
View File

@@ -4,8 +4,8 @@ import com.googlecode.aviator.AviatorEvaluator;
import com.googlecode.aviator.Expression;
import com.usthe.alert.AlerterWorkerPool;
import com.usthe.alert.AlerterDataQueue;
import com.usthe.alert.pojo.entity.Alert;
import com.usthe.alert.pojo.entity.AlertDefine;
import com.usthe.common.entity.alerter.Alert;
import com.usthe.common.entity.alerter.AlertDefine;
import com.usthe.alert.service.AlertDefineService;
import com.usthe.alert.util.AlertTemplateUtil;
import com.usthe.collector.dispatch.export.MetricsDataExporter;

4
alerter/src/main/java/com/usthe/alert/controller/AlertDefineController.java
View File

@@ -1,7 +1,7 @@
package com.usthe.alert.controller;
import com.usthe.alert.pojo.entity.AlertDefine;
import com.usthe.alert.pojo.entity.AlertDefineBind;
import com.usthe.common.entity.alerter.AlertDefine;
import com.usthe.common.entity.alerter.AlertDefineBind;
import com.usthe.alert.service.AlertDefineService;
import com.usthe.common.entity.dto.Message;
import io.swagger.annotations.Api;

2
alerter/src/main/java/com/usthe/alert/controller/AlertDefinesController.java
View File

@@ -1,6 +1,6 @@
package com.usthe.alert.controller;
import com.usthe.alert.pojo.entity.AlertDefine;
import com.usthe.common.entity.alerter.AlertDefine;
import com.usthe.alert.service.AlertDefineService;
import com.usthe.common.entity.dto.Message;
import io.swagger.annotations.Api;

2
alerter/src/main/java/com/usthe/alert/controller/AlertsController.java
View File

@@ -1,6 +1,6 @@
package com.usthe.alert.controller;
import com.usthe.alert.pojo.entity.Alert;
import com.usthe.common.entity.alerter.Alert;
import com.usthe.alert.service.AlertService;
import com.usthe.common.entity.dto.Message;
import io.swagger.annotations.Api;

2
alerter/src/main/java/com/usthe/alert/dao/AlertDao.java
View File

@@ -1,6 +1,6 @@
package com.usthe.alert.dao;
import com.usthe.alert.pojo.entity.Alert;
import com.usthe.common.entity.alerter.Alert;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;

2
alerter/src/main/java/com/usthe/alert/dao/AlertDefineBindDao.java
View File

@@ -1,6 +1,6 @@
package com.usthe.alert.dao;
import com.usthe.alert.pojo.entity.AlertDefineBind;
import com.usthe.common.entity.alerter.AlertDefineBind;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

2
alerter/src/main/java/com/usthe/alert/dao/AlertDefineDao.java
View File

@@ -1,6 +1,6 @@
package com.usthe.alert.dao;
import com.usthe.alert.pojo.entity.AlertDefine;
import com.usthe.common.entity.alerter.AlertDefine;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;

4
alerter/src/main/java/com/usthe/alert/service/AlertDefineService.java
View File

@@ -1,7 +1,7 @@
package com.usthe.alert.service;
import com.usthe.alert.pojo.entity.AlertDefine;
import com.usthe.alert.pojo.entity.AlertDefineBind;
import com.usthe.common.entity.alerter.AlertDefine;
import com.usthe.common.entity.alerter.AlertDefineBind;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.jpa.domain.Specification;

2
alerter/src/main/java/com/usthe/alert/service/AlertService.java
View File

@@ -1,6 +1,6 @@
package com.usthe.alert.service;
import com.usthe.alert.pojo.entity.Alert;
import com.usthe.common.entity.alerter.Alert;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.jpa.domain.Specification;

4
alerter/src/main/java/com/usthe/alert/service/impl/AlertDefineServiceImpl.java
View File

@@ -2,8 +2,8 @@ package com.usthe.alert.service.impl;
import com.usthe.alert.dao.AlertDefineBindDao;
import com.usthe.alert.dao.AlertDefineDao;
import com.usthe.alert.pojo.entity.AlertDefine;
import com.usthe.alert.pojo.entity.AlertDefineBind;
import com.usthe.common.entity.alerter.AlertDefine;
import com.usthe.common.entity.alerter.AlertDefineBind;
import com.usthe.alert.service.AlertDefineService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

2
alerter/src/main/java/com/usthe/alert/service/impl/AlertServiceImpl.java
View File

@@ -1,7 +1,7 @@
package com.usthe.alert.service.impl;
import com.usthe.alert.dao.AlertDao;
import com.usthe.alert.pojo.entity.Alert;
import com.usthe.common.entity.alerter.Alert;
import com.usthe.alert.service.AlertService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

2
alerter/src/main/java/com/usthe/alert/pojo/entity/Alert.java → common/src/main/java/com/usthe/common/entity/alerter/Alert.java
View File

@@ -1,4 +1,4 @@
package com.usthe.alert.pojo.entity;
package com.usthe.common.entity.alerter;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
alerter/src/main/java/com/usthe/alert/pojo/entity/AlertDefine.java → common/src/main/java/com/usthe/common/entity/alerter/AlertDefine.java
View File

@@ -1,4 +1,4 @@
package com.usthe.alert.pojo.entity;
package com.usthe.common.entity.alerter;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
alerter/src/main/java/com/usthe/alert/pojo/entity/AlertDefineBind.java → common/src/main/java/com/usthe/common/entity/alerter/AlertDefineBind.java
View File

@@ -1,4 +1,4 @@
package com.usthe.alert.pojo.entity;
package com.usthe.common.entity.alerter;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
manager/src/main/java/com/usthe/manager/pojo/entity/JsonOptionListAttributeConverter.java → common/src/main/java/com/usthe/common/entity/manager/JsonOptionListAttributeConverter.java
View File

@@ -1,4 +1,4 @@
package com.usthe.manager.pojo.entity;
package com.usthe.common.entity.manager;
import com.usthe.common.util.GsonUtil;

5
manager/src/main/java/com/usthe/manager/pojo/entity/Monitor.java → common/src/main/java/com/usthe/common/entity/manager/Monitor.java
View File

@@ -1,6 +1,7 @@
package com.usthe.manager.pojo.entity;
package com.usthe.common.entity.manager;
import com.usthe.manager.support.valid.HostValid;
import com.usthe.common.support.valid.HostValid;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;

2
manager/src/main/java/com/usthe/manager/pojo/entity/NoticeReceiver.java → common/src/main/java/com/usthe/common/entity/manager/NoticeReceiver.java
View File

@@ -1,4 +1,4 @@
package com.usthe.manager.pojo.entity;
package com.usthe.common.entity.manager;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
manager/src/main/java/com/usthe/manager/pojo/entity/NoticeRule.java → common/src/main/java/com/usthe/common/entity/manager/NoticeRule.java
View File

@@ -1,4 +1,4 @@
package com.usthe.manager.pojo.entity;
package com.usthe.common.entity.manager;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
manager/src/main/java/com/usthe/manager/pojo/entity/Param.java → common/src/main/java/com/usthe/common/entity/manager/Param.java
View File

@@ -1,4 +1,4 @@
package com.usthe.manager.pojo.entity;
package com.usthe.common.entity.manager;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
manager/src/main/java/com/usthe/manager/pojo/entity/ParamDefine.java → common/src/main/java/com/usthe/common/entity/manager/ParamDefine.java
View File

@@ -1,4 +1,4 @@
package com.usthe.manager.pojo.entity;
package com.usthe.common.entity.manager;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

6
manager/src/main/java/com/usthe/manager/component/alerter/DispatchAlarm.java
View File

@@ -2,11 +2,11 @@ package com.usthe.manager.component.alerter;
import com.usthe.alert.AlerterDataQueue;
import com.usthe.alert.AlerterWorkerPool;
import com.usthe.alert.pojo.entity.Alert;
import com.usthe.common.entity.alerter.Alert;
import com.usthe.alert.service.AlertService;
import com.usthe.common.util.CommonConstants;
import com.usthe.manager.pojo.entity.Monitor;
import com.usthe.manager.pojo.entity.NoticeReceiver;
import com.usthe.common.entity.manager.Monitor;
import com.usthe.common.entity.manager.NoticeReceiver;
import com.usthe.manager.service.MonitorService;
import com.usthe.manager.service.NoticeConfigService;
import lombok.extern.slf4j.Slf4j;

2
manager/src/main/java/com/usthe/manager/controller/AppController.java
View File

@@ -2,7 +2,7 @@ package com.usthe.manager.controller;
import com.usthe.common.entity.dto.Message;
import com.usthe.manager.pojo.dto.Hierarchy;
import com.usthe.manager.pojo.entity.ParamDefine;
import com.usthe.common.entity.manager.ParamDefine;
import com.usthe.manager.service.AppService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

1
manager/src/main/java/com/usthe/manager/controller/I18nController.java
View File

@@ -1,7 +1,6 @@
package com.usthe.manager.controller;
import com.usthe.common.entity.dto.Message;
import com.usthe.manager.pojo.entity.ParamDefine;
import com.usthe.manager.service.AppService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

2
manager/src/main/java/com/usthe/manager/controller/MonitorsController.java
View File

@@ -1,7 +1,7 @@
package com.usthe.manager.controller;
import com.usthe.common.entity.dto.Message;
import com.usthe.manager.pojo.entity.Monitor;
import com.usthe.common.entity.manager.Monitor;
import com.usthe.manager.service.MonitorService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

4
manager/src/main/java/com/usthe/manager/controller/NoticeConfigController.java
View File

@@ -1,8 +1,8 @@
package com.usthe.manager.controller;
import com.usthe.common.entity.dto.Message;
import com.usthe.manager.pojo.entity.NoticeReceiver;
import com.usthe.manager.pojo.entity.NoticeRule;
import com.usthe.common.entity.manager.NoticeReceiver;
import com.usthe.common.entity.manager.NoticeRule;
import com.usthe.manager.service.NoticeConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

2
manager/src/main/java/com/usthe/manager/dao/MonitorDao.java
View File

@@ -1,7 +1,7 @@
package com.usthe.manager.dao;
import com.usthe.manager.pojo.dto.AppCount;
import com.usthe.manager.pojo.entity.Monitor;
import com.usthe.common.entity.manager.Monitor;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;

2
manager/src/main/java/com/usthe/manager/dao/NoticeReceiverDao.java
View File

@@ -1,6 +1,6 @@
package com.usthe.manager.dao;
import com.usthe.manager.pojo.entity.NoticeReceiver;
import com.usthe.common.entity.manager.NoticeReceiver;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

2
manager/src/main/java/com/usthe/manager/dao/NoticeRuleDao.java
View File

@@ -1,6 +1,6 @@
package com.usthe.manager.dao;
import com.usthe.manager.pojo.entity.NoticeRule;
import com.usthe.common.entity.manager.NoticeRule;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

2
manager/src/main/java/com/usthe/manager/dao/ParamDao.java
View File

@@ -1,6 +1,6 @@
package com.usthe.manager.dao;
import com.usthe.manager.pojo.entity.Param;
import com.usthe.common.entity.manager.Param;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;

3
manager/src/main/java/com/usthe/manager/dao/ParamDefineDao.java
View File

@@ -1,10 +1,9 @@
package com.usthe.manager.dao;
import com.usthe.manager.pojo.entity.ParamDefine;
import com.usthe.common.entity.manager.ParamDefine;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
import java.util.Optional;
/**
* ParamDefine数据库操作

4
manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDto.java
View File

@@ -1,7 +1,7 @@
package com.usthe.manager.pojo.dto;
import com.usthe.manager.pojo.entity.Monitor;
import com.usthe.manager.pojo.entity.Param;
import com.usthe.common.entity.manager.Monitor;
import com.usthe.common.entity.manager.Param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
manager/src/main/java/com/usthe/manager/pojo/dto/ParamDefineDto.java
View File

@@ -1,6 +1,6 @@
package com.usthe.manager.pojo.dto;
import com.usthe.manager.pojo.entity.ParamDefine;
import com.usthe.common.entity.manager.ParamDefine;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

2
manager/src/main/java/com/usthe/manager/service/AppService.java
View File

@@ -2,7 +2,7 @@ package com.usthe.manager.service;
import com.usthe.common.entity.job.Job;
import com.usthe.manager.pojo.dto.Hierarchy;
import com.usthe.manager.pojo.entity.ParamDefine;
import com.usthe.common.entity.manager.ParamDefine;
import java.util.List;
import java.util.Map;

4
manager/src/main/java/com/usthe/manager/service/MonitorService.java
View File

@@ -2,8 +2,8 @@ package com.usthe.manager.service;
import com.usthe.manager.pojo.dto.AppCount;
import com.usthe.manager.pojo.dto.MonitorDto;
import com.usthe.manager.pojo.entity.Monitor;
import com.usthe.manager.pojo.entity.Param;
import com.usthe.common.entity.manager.Monitor;
import com.usthe.common.entity.manager.Param;
import com.usthe.manager.support.exception.MonitorDetectException;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;

6
manager/src/main/java/com/usthe/manager/service/NoticeConfigService.java
View File

@@ -1,8 +1,8 @@
package com.usthe.manager.service;
import com.usthe.alert.pojo.entity.Alert;
import com.usthe.manager.pojo.entity.NoticeReceiver;
import com.usthe.manager.pojo.entity.NoticeRule;
import com.usthe.common.entity.alerter.Alert;
import com.usthe.common.entity.manager.NoticeReceiver;
import com.usthe.common.entity.manager.NoticeRule;
import org.springframework.data.jpa.domain.Specification;
import java.util.List;

2
manager/src/main/java/com/usthe/manager/service/impl/AppServiceImpl.java
View File

@@ -5,7 +5,7 @@ import com.usthe.common.entity.job.Metrics;
import com.usthe.manager.dao.ParamDefineDao;
import com.usthe.manager.pojo.dto.Hierarchy;
import com.usthe.manager.pojo.dto.ParamDefineDto;
import com.usthe.manager.pojo.entity.ParamDefine;
import com.usthe.common.entity.manager.ParamDefine;
import com.usthe.manager.service.AppService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

6
manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java
View File

@@ -14,9 +14,9 @@ import com.usthe.manager.dao.MonitorDao;
import com.usthe.manager.dao.ParamDao;
import com.usthe.manager.pojo.dto.AppCount;
import com.usthe.manager.pojo.dto.MonitorDto;
import com.usthe.manager.pojo.entity.Monitor;
import com.usthe.manager.pojo.entity.Param;
import com.usthe.manager.pojo.entity.ParamDefine;
import com.usthe.common.entity.manager.Monitor;
import com.usthe.common.entity.manager.Param;
import com.usthe.common.entity.manager.ParamDefine;
import com.usthe.manager.service.AppService;
import com.usthe.manager.service.MonitorService;
import com.usthe.manager.support.exception.MonitorDatabaseException;

6
manager/src/main/java/com/usthe/manager/service/impl/NoticeConfigServiceImpl.java
View File

@@ -1,10 +1,10 @@
package com.usthe.manager.service.impl;
import com.usthe.alert.pojo.entity.Alert;
import com.usthe.common.entity.alerter.Alert;
import com.usthe.manager.dao.NoticeReceiverDao;
import com.usthe.manager.dao.NoticeRuleDao;
import com.usthe.manager.pojo.entity.NoticeReceiver;
import com.usthe.manager.pojo.entity.NoticeRule;
import com.usthe.common.entity.manager.NoticeReceiver;
import com.usthe.common.entity.manager.NoticeRule;
import com.usthe.manager.service.NoticeConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

48
manager/src/main/java/com/usthe/manager/support/SpringContextHolder.java
View File

@@ -1,48 +0,0 @@
package com.usthe.manager.support;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
/**
* Spring的ApplicationContext的持有者,可以用静态方法的方式获取spring容器中的bean
* @author tomsun28
* @date 21:07 2018/4/18
*/
@Component
public class SpringContextHolder implements ApplicationContextAware {
private static ApplicationContext applicationContext;
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
set(applicationContext);
}
private static void set(ApplicationContext applicationContext) {
SpringContextHolder.applicationContext = applicationContext;
}
public static ApplicationContext getApplicationContext() {
assertApplicationContext();
return applicationContext;
}
@SuppressWarnings("unchecked")
public static <T> T getBean(String beanName) {
assertApplicationContext();
return (T) applicationContext.getBean(beanName);
}
public static <T> T getBean(Class<T> tClass) {
assertApplicationContext();
return (T) applicationContext.getBean(tClass);
}
private static void assertApplicationContext() {
if (null == SpringContextHolder.applicationContext) {
throw new RuntimeException("applicationContext为空,请检查是否注入springContextHolder");
}
}
}

20
manager/src/main/java/com/usthe/manager/support/valid/HostParamValidator.java
View File

@@ -1,20 +0,0 @@
package com.usthe.manager.support.valid;
import com.usthe.common.util.IpDomainUtil;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
/**
* host注解数据自定义校验器
* @author tomsun28
* @date 2021/11/17 19:44
*/
public class HostParamValidator implements ConstraintValidator<HostValid, String> {
@Override
public boolean isValid(String value, ConstraintValidatorContext context) {
// 判断value是否满足ipv4 ipv5 域名 格式
return IpDomainUtil.validateIpDomain(value);
}
}

29
manager/src/main/java/com/usthe/manager/support/valid/HostValid.java
View File

@@ -1,29 +0,0 @@
package com.usthe.manager.support.valid;
import javax.validation.Constraint;
import javax.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* host注解数据自定义校验器注解
* @author tomsun28
* @date 2021/11/17 19:42
*/
@Target({ FIELD, PARAMETER })
@Retention(RUNTIME)
@Documented
@Constraint(validatedBy = HostParamValidator.class)
public @interface HostValid {
String message() default "Host value is invalid,must ipv4, ipv6 or domain";
Class<?>[] groups() default {};
Class<? extends Payload>[] payload() default {};
}