diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java index c23aa96a..0e9abe51 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java @@ -6,16 +6,14 @@ import com.google.common.collect.Lists; import com.sun.mail.imap.IMAPStore; import com.sun.mail.smtp.SMTPAddressFailedException; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ArrayUtils; import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.email.emuns.MailContentType; -import org.jeecg.modules.base.entity.SysEmail; +import org.jeecg.modules.base.entity.postgre.SysEmail; import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Component; import javax.mail.*; -import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeUtility; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RedisStreamUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RedisStreamUtil.java index 6ce789c7..103eb1d0 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RedisStreamUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RedisStreamUtil.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.modules.base.dto.RuleDto; -import org.jeecg.modules.base.entity.AlarmRule; +import org.jeecg.modules.base.entity.postgre.AlarmRule; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.stream.*; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/SampleDataDto.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/SampleDataDto.java index 94416a1e..5e89a70d 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/SampleDataDto.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/SampleDataDto.java @@ -1,12 +1,8 @@ package org.jeecg.modules.base.dto; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.jeecg.modules.base.entity.GardsSampleData; +import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/dto/TypeDto.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/TypeDto.java similarity index 85% rename from jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/dto/TypeDto.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/TypeDto.java index 0705453d..66153b09 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/dto/TypeDto.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/TypeDto.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.dto; +package org.jeecg.modules.base.dto; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsBgEfficiencyPairs.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsBgEfficiencyPairs.java similarity index 95% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsBgEfficiencyPairs.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsBgEfficiencyPairs.java index 3db92b14..68d8b493 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsBgEfficiencyPairs.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsBgEfficiencyPairs.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsCalibrationPairsOrig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsCalibrationPairsOrig.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsCalibrationPairsOrig.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsCalibrationPairsOrig.java index f74954df..96bd63b4 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsCalibrationPairsOrig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsCalibrationPairsOrig.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsHistogram.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsHistogram.java similarity index 95% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsHistogram.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsHistogram.java index 62185922..c67ef1d7 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsHistogram.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsHistogram.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsMetData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java similarity index 98% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsMetData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java index ab028d33..266c7caf 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsMetData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsRoiLimits.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsRoiLimits.java similarity index 95% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsRoiLimits.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsRoiLimits.java index 19716869..f56403ce 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsRoiLimits.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsRoiLimits.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleAux.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleAux.java similarity index 97% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleAux.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleAux.java index db2b77e9..1d3614c6 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleAux.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleAux.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleCert.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCert.java similarity index 93% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleCert.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCert.java index 3085f785..c1b69299 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleCert.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCert.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleCertLine.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCertLine.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleCertLine.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCertLine.java index b657dbe9..0e66b5be 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleCertLine.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCertLine.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleData.java similarity index 99% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleData.java index d8744b99..6c369f17 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleDescription.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleDescription.java similarity index 91% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleDescription.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleDescription.java index ac6f3443..62e119f8 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleDescription.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleDescription.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleRatios.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleRatios.java similarity index 95% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleRatios.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleRatios.java index 13c13b8f..62d2880c 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleRatios.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleRatios.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSohData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java similarity index 98% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSohData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java index bd9cb41b..e12adc53 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSohData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSpectrum.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSpectrum.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSpectrum.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSpectrum.java index 92cc59d8..8ba6b57a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSpectrum.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSpectrum.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsTotalEfficiencyPairs.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsTotalEfficiencyPairs.java similarity index 95% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsTotalEfficiencyPairs.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsTotalEfficiencyPairs.java index f0f3c3a4..f40c5f64 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsTotalEfficiencyPairs.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsTotalEfficiencyPairs.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroup.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmContactGroup.java similarity index 97% rename from jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroup.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmContactGroup.java index f5e6cc38..4e288a82 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroup.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmContactGroup.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroupMember.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmContactGroupMember.java similarity index 93% rename from jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroupMember.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmContactGroupMember.java index b236c9c9..09705812 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroupMember.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmContactGroupMember.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/AlarmItem.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmItem.java similarity index 91% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/AlarmItem.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmItem.java index 7e467055..1451d164 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/AlarmItem.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmItem.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/AlarmLog.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmLog.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/AlarmLog.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmLog.java index a3d629aa..d916b546 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/AlarmLog.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmLog.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/AlarmRule.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmRule.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/AlarmRule.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmRule.java index be3a9ca9..fe2203ec 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/AlarmRule.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmRule.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.jeecg.modules.base.entity.Rule; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysDatabase.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDatabase.java similarity index 97% rename from jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysDatabase.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDatabase.java index 68fc51fd..81ea1f2d 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysDatabase.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDatabase.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmail.java similarity index 97% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmail.java index 0d2c3573..ea822dc2 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmail.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmailLog.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmailLog.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmailLog.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmailLog.java index d297cda9..fd293dc3 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmailLog.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmailLog.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysRole.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRole.java similarity index 97% rename from jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysRole.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRole.java index 2e78e250..f9350a23 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysRole.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRole.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysServer.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysServer.java similarity index 96% rename from jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysServer.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysServer.java index ad4c7267..bbff3690 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysServer.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysServer.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysUser.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUser.java similarity index 98% rename from jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysUser.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUser.java index 3db925de..46755db3 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysUser.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUser.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsAnalyses.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java similarity index 98% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsAnalyses.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java index b0fbb7e0..0179d2ac 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsAnalyses.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsCalibration.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibration.java similarity index 98% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsCalibration.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibration.java index f3135876..53cfcf13 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsCalibration.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibration.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsCalibrationPairs.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibrationPairs.java similarity index 97% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsCalibrationPairs.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibrationPairs.java index 99ee09c7..cb72fc57 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsCalibrationPairs.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibrationPairs.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsNuclIded.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclIded.java similarity index 98% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsNuclIded.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclIded.java index 4abb82e1..488b60f0 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsNuclIded.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclIded.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsNuclLinesIded.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclLinesIded.java similarity index 98% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsNuclLinesIded.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclLinesIded.java index 4c641450..1e7d495e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsNuclLinesIded.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclLinesIded.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsPeaks.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsPeaks.java similarity index 98% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsPeaks.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsPeaks.java index 60c8a35b..a2d4fcac 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsPeaks.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsPeaks.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsRoiChannels.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiChannels.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsRoiChannels.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiChannels.java index 8690269e..0759427f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsRoiChannels.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiChannels.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsRoiResults.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiResults.java similarity index 97% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsRoiResults.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiResults.java index 64bdd4ba..98b69836 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsRoiResults.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiResults.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsXeResults.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsXeResults.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsXeResults.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsXeResults.java index 035eced5..4be801db 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsXeResults.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsXeResults.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java index 267bd125..7953436c 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java @@ -4,7 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.AlarmContactGroup; +import org.jeecg.modules.base.entity.postgre.AlarmContactGroup; import org.jeecg.modules.service.IAlarmContactGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupMemberController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupMemberController.java index 9fe3ac6f..28984010 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupMemberController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupMemberController.java @@ -1,12 +1,8 @@ package org.jeecg.modules.controller; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.AlarmContactGroup; import org.jeecg.modules.service.IAlarmContactGroupMemberService; -import org.jeecg.modules.service.IAlarmContactGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmItemController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmItemController.java index 4eb3fe0f..288b9439 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmItemController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmItemController.java @@ -1,23 +1,11 @@ package org.jeecg.modules.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.modules.base.entity.AlarmItem; +import org.jeecg.modules.base.entity.postgre.AlarmItem; import org.jeecg.modules.service.IAlarmItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; @Api(value = "监控项管理",tags = "监控项管理") @RestController diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java index f9b95337..585b009e 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java @@ -3,7 +3,7 @@ package org.jeecg.modules.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.AlarmLog; +import org.jeecg.modules.base.entity.postgre.AlarmLog; import org.jeecg.modules.service.IAlarmLogService; import org.jeecg.modules.vo.AlarmVo; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java index 4b181954..fdd6ba45 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java @@ -3,7 +3,7 @@ package org.jeecg.modules.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.AlarmRule; +import org.jeecg.modules.base.entity.postgre.AlarmRule; import org.jeecg.modules.base.entity.monitor.Host; import org.jeecg.modules.base.entity.monitor.Servers; import org.jeecg.modules.base.vo.AlarmRuleVo; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java index 8de5971f..15272da2 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java @@ -6,7 +6,7 @@ import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.base.dto.SourceDto; import org.jeecg.modules.base.vo.SourceVo; -import org.jeecg.modules.entity.SysDatabase; +import org.jeecg.modules.base.entity.postgre.SysDatabase; import org.jeecg.modules.service.ISysDatabaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java index 382bae57..d0245ff6 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java @@ -4,15 +4,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.SysEmail; +import org.jeecg.modules.base.entity.postgre.SysEmail; import org.jeecg.modules.base.dto.SourceDto; import org.jeecg.modules.base.vo.SourceVo; import org.jeecg.modules.service.ISysEmailService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; -import java.util.Date; import java.util.List; @RestController diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java index ca6f3488..688352e4 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java @@ -6,13 +6,11 @@ import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.base.dto.SourceDto; import org.jeecg.modules.base.vo.SourceVo; -import org.jeecg.modules.entity.SysServer; +import org.jeecg.modules.base.entity.postgre.SysServer; import org.jeecg.modules.service.ISysServerService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; -import java.util.Date; import java.util.List; @RestController diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/SystemClient.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/SystemClient.java index 7d017827..0bb5c122 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/SystemClient.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/SystemClient.java @@ -1,13 +1,10 @@ package org.jeecg.modules.feignclient; -import org.jeecg.modules.entity.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import java.util.List; import java.util.Map; @Component diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMapper.java index b381ec5f..7a3ce705 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.AlarmContactGroup; +import org.jeecg.modules.base.entity.postgre.AlarmContactGroup; public interface AlarmContactGroupMapper extends BaseMapper { } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMemberMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMemberMapper.java index 92c5f1a2..3c4c7e4f 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMemberMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMemberMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.AlarmContactGroupMember; +import org.jeecg.modules.base.entity.postgre.AlarmContactGroupMember; public interface AlarmContactGroupMemberMapper extends BaseMapper { } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmItemMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmItemMapper.java index 38dc9cd6..def45235 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmItemMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmItemMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.base.entity.AlarmItem; +import org.jeecg.modules.base.entity.postgre.AlarmItem; public interface AlarmItemMapper extends BaseMapper { diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmLogMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmLogMapper.java index 6690d4a6..b1b7dcdb 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmLogMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmLogMapper.java @@ -1,9 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.dto.TypeDto; +import org.jeecg.modules.base.dto.TypeDto; import org.jeecg.modules.entity.AlarmHistory; -import org.jeecg.modules.base.entity.AlarmLog; +import org.jeecg.modules.base.entity.postgre.AlarmLog; import java.time.LocalDateTime; import java.util.List; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmRuleMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmRuleMapper.java index 47c409df..f7c9d10d 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmRuleMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmRuleMapper.java @@ -3,7 +3,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.base.dto.AlarmRuleDto; import org.jeecg.modules.base.dto.AlarmRuleInfo; -import org.jeecg.modules.base.entity.AlarmRule; +import org.jeecg.modules.base.entity.postgre.AlarmRule; import java.util.List; import java.util.Map; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java index c55ef58e..1d5dfa6f 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java @@ -1,13 +1,10 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; import org.jeecg.modules.base.dto.DatabaseDto; -import org.jeecg.modules.base.dto.ServerDto; import org.jeecg.modules.entity.AlarmHistory; -import org.jeecg.modules.entity.SysDatabase; +import org.jeecg.modules.base.entity.postgre.SysDatabase; -import java.util.Date; import java.util.List; import java.util.Map; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailLogMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailLogMapper.java index 674ed114..369af91a 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailLogMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailLogMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.base.entity.SysEmailLog; +import org.jeecg.modules.base.entity.postgre.SysEmailLog; /** * 系统邮件日志 diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java index 8f6f68b8..dcfbb37e 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java @@ -1,13 +1,10 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; import org.jeecg.modules.base.dto.EmailDto; -import org.jeecg.modules.base.dto.ServerDto; import org.jeecg.modules.entity.AlarmHistory; -import org.jeecg.modules.base.entity.SysEmail; +import org.jeecg.modules.base.entity.postgre.SysEmail; -import java.util.Date; import java.util.List; import java.util.Map; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysServerMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysServerMapper.java index 04fbd07b..b650d279 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysServerMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysServerMapper.java @@ -1,13 +1,10 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import org.jeecg.modules.base.dto.ServerDto; import org.jeecg.modules.entity.AlarmHistory; -import org.jeecg.modules.entity.SysServer; +import org.jeecg.modules.base.entity.postgre.SysServer; -import java.util.Date; import java.util.List; import java.util.Map; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/AlarmLogMapper.xml b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/AlarmLogMapper.xml index 0efc08c0..9610858d 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/AlarmLogMapper.xml +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/AlarmLogMapper.xml @@ -67,7 +67,7 @@ LIMIT #{pageSize} OFFSET #{pageStart} - SELECT r.source_type AS name, COUNT (r.source_type) AS value @@ -90,7 +90,7 @@ GROUP BY r.source_type - SELECT r.name, l.ruleCount AS value diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupMemberService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupMemberService.java index d5de7707..8adeaa2a 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupMemberService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupMemberService.java @@ -1,11 +1,8 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.AlarmContactGroup; -import org.jeecg.modules.entity.AlarmContactGroupMember; -import org.springframework.web.bind.annotation.RequestParam; +import org.jeecg.modules.base.entity.postgre.AlarmContactGroupMember; public interface IAlarmContactGroupMemberService extends IService { Result userIds(String groupId); diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java index a3bf33e2..e78f3b62 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java @@ -3,7 +3,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.AlarmContactGroup; +import org.jeecg.modules.base.entity.postgre.AlarmContactGroup; public interface IAlarmContactGroupService extends IService { diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmItemService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmItemService.java index ad0bda0c..d866b58d 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmItemService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmItemService.java @@ -2,7 +2,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.AlarmItem; +import org.jeecg.modules.base.entity.postgre.AlarmItem; public interface IAlarmItemService extends IService { Result syncItem(String sourceType,String code); diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmLogService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmLogService.java index dd01ac6f..fb37dcc0 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmLogService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmLogService.java @@ -2,7 +2,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.AlarmLog; +import org.jeecg.modules.base.entity.postgre.AlarmLog; import org.jeecg.modules.vo.AlarmVo; public interface IAlarmLogService extends IService { diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmRuleService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmRuleService.java index c78db956..644bfbb9 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmRuleService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmRuleService.java @@ -1,9 +1,8 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.AlarmRule; +import org.jeecg.modules.base.entity.postgre.AlarmRule; import org.jeecg.modules.base.vo.AlarmRuleVo; public interface IAlarmRuleService extends IService { diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java index 3435f05e..0980df46 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java @@ -5,9 +5,8 @@ import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.base.dto.SourceDto; import org.jeecg.modules.base.vo.SourceVo; -import org.jeecg.modules.entity.SysDatabase; +import org.jeecg.modules.base.entity.postgre.SysDatabase; -import java.util.Date; import java.util.List; public interface ISysDatabaseService extends IService { diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailLogService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailLogService.java index 8787a849..8a2e0f1e 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailLogService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailLogService.java @@ -2,8 +2,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.SysEmailLog; -import org.springframework.web.bind.annotation.RequestParam; +import org.jeecg.modules.base.entity.postgre.SysEmailLog; public interface ISysEmailLogService extends IService { Result totalEmail(String emailId); diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java index 07108647..d2a58292 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java @@ -3,11 +3,10 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.SysEmail; +import org.jeecg.modules.base.entity.postgre.SysEmail; import org.jeecg.modules.base.dto.SourceDto; import org.jeecg.modules.base.vo.SourceVo; -import java.util.Date; import java.util.List; public interface ISysEmailService extends IService { diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysServerService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysServerService.java index 593f8f9b..560e0df4 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysServerService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysServerService.java @@ -5,9 +5,8 @@ import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.base.dto.SourceDto; import org.jeecg.modules.base.vo.SourceVo; -import org.jeecg.modules.entity.SysServer; +import org.jeecg.modules.base.entity.postgre.SysServer; -import java.util.Date; import java.util.List; public interface ISysServerService extends IService { diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupMemberServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupMemberServiceImpl.java index a95d348c..3c8930da 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupMemberServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupMemberServiceImpl.java @@ -3,7 +3,7 @@ package org.jeecg.modules.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.AlarmContactGroupMember; +import org.jeecg.modules.base.entity.postgre.AlarmContactGroupMember; import org.jeecg.modules.mapper.AlarmContactGroupMemberMapper; import org.jeecg.modules.service.IAlarmContactGroupMemberService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java index bc9ef93b..4c955c88 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java @@ -11,9 +11,9 @@ import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.modules.entity.AlarmContactGroup; -import org.jeecg.modules.entity.AlarmContactGroupMember; -import org.jeecg.modules.entity.SysUser; +import org.jeecg.modules.base.entity.postgre.AlarmContactGroup; +import org.jeecg.modules.base.entity.postgre.AlarmContactGroupMember; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.feignclient.SystemClient; import org.jeecg.modules.mapper.AlarmContactGroupMapper; import org.jeecg.modules.mapper.AlarmContactGroupMemberMapper; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmItemServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmItemServiceImpl.java index 3a94db81..1d5b99d0 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmItemServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmItemServiceImpl.java @@ -6,7 +6,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.Prompt; -import org.jeecg.modules.base.entity.AlarmItem; +import org.jeecg.modules.base.entity.postgre.AlarmItem; import org.jeecg.modules.base.entity.monitor.Host; import org.jeecg.modules.base.entity.monitor.Item; import org.jeecg.modules.base.entity.monitor.Servers; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmLogServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmLogServiceImpl.java index f884fb90..3ad9f1c5 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmLogServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmLogServiceImpl.java @@ -11,9 +11,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.DateConstant; -import org.jeecg.modules.dto.TypeDto; +import org.jeecg.modules.base.dto.TypeDto; import org.jeecg.modules.entity.AlarmHistory; -import org.jeecg.modules.base.entity.AlarmLog; +import org.jeecg.modules.base.entity.postgre.AlarmLog; import org.jeecg.modules.mapper.AlarmLogMapper; import org.jeecg.modules.service.IAlarmLogService; import org.jeecg.modules.vo.AlarmVo; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java index 8658bc6b..27c6ee93 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java @@ -13,7 +13,7 @@ import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.util.RedisStreamUtil; import org.jeecg.modules.base.dto.AlarmRuleDto; import org.jeecg.modules.base.dto.AlarmRuleInfo; -import org.jeecg.modules.base.entity.AlarmRule; +import org.jeecg.modules.base.entity.postgre.AlarmRule; import org.jeecg.modules.base.entity.Rule; import org.jeecg.modules.base.vo.AlarmRuleVo; import org.jeecg.modules.base.dto.SourceDto; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java index 9852202f..c4e10c85 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java @@ -11,18 +11,16 @@ import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.DateConstant; import org.jeecg.common.constant.Prompt; -import org.jeecg.common.util.DateUtils; import org.jeecg.modules.base.dto.DatabaseDto; import org.jeecg.modules.base.dto.SourceDto; import org.jeecg.modules.base.vo.SourceVo; import org.jeecg.modules.entity.AlarmHistory; -import org.jeecg.modules.entity.SysDatabase; +import org.jeecg.modules.base.entity.postgre.SysDatabase; import org.jeecg.modules.mapper.SysDatabaseMapper; import org.jeecg.modules.service.ISysDatabaseService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.text.ParseException; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.*; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailLogServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailLogServiceImpl.java index f3ff4fa7..a1fb3352 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailLogServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailLogServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.SysEmailLog; +import org.jeecg.modules.base.entity.postgre.SysEmailLog; import org.jeecg.modules.mapper.SysEmailLogMapper; import org.jeecg.modules.service.ISysEmailLogService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java index 68bdcc84..6ef0af50 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java @@ -13,18 +13,16 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.DateConstant; import org.jeecg.common.constant.Prompt; import org.jeecg.common.email.emuns.SysMailType; -import org.jeecg.common.util.DateUtils; import org.jeecg.modules.base.dto.EmailDto; import org.jeecg.modules.base.dto.SourceDto; import org.jeecg.modules.base.vo.SourceVo; import org.jeecg.modules.entity.AlarmHistory; -import org.jeecg.modules.base.entity.SysEmail; +import org.jeecg.modules.base.entity.postgre.SysEmail; import org.jeecg.modules.mapper.SysEmailMapper; import org.jeecg.modules.service.ISysEmailService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.text.ParseException; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.*; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java index e90c5ad6..cda73020 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java @@ -12,18 +12,16 @@ import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.DateConstant; import org.jeecg.common.constant.Prompt; -import org.jeecg.common.util.DateUtils; import org.jeecg.modules.base.dto.ServerDto; import org.jeecg.modules.base.dto.SourceDto; import org.jeecg.modules.base.vo.SourceVo; import org.jeecg.modules.entity.AlarmHistory; -import org.jeecg.modules.entity.SysServer; +import org.jeecg.modules.base.entity.postgre.SysServer; import org.jeecg.modules.mapper.SysServerMapper; import org.jeecg.modules.service.ISysServerService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.text.ParseException; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.*;