abnormal-alarm模块下实体类移动

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;

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.*;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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.*;

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.*;
 

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

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;

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;

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.*;

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

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

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

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<AlarmContactGroup> {
 }

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<AlarmContactGroupMember> {
 }

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<AlarmItem> {
 

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;

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;

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;
 

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;
 
 /**
  * 系统邮件日志

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;
 

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;
 

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/AlarmLogMapper.xml

@@ -67,7 +67,7 @@
             LIMIT #{pageSize} OFFSET #{pageStart}
         </if>
     </select>
-    <select id="typeAlarms" parameterType="Map" resultType="org.jeecg.modules.dto.TypeDto">
+    <select id="typeAlarms" parameterType="Map" resultType="org.jeecg.modules.base.dto.TypeDto">
         SELECT
             r.source_type AS name,
             COUNT (r.source_type) AS value
@@ -90,7 +90,7 @@
         </where>
         GROUP BY r.source_type
     </select>
-    <select id="ruleTop5" parameterType="Map" resultType="org.jeecg.modules.dto.TypeDto">
+    <select id="ruleTop5" parameterType="Map" resultType="org.jeecg.modules.base.dto.TypeDto">
         SELECT
             r.name,
             l.ruleCount AS value

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<AlarmContactGroupMember> {
     Result userIds(String groupId);

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<AlarmContactGroup> {
 

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<AlarmItem> {
     Result syncItem(String sourceType,String code);

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<AlarmLog> {

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<AlarmRule> {

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<SysDatabase> {

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<SysEmailLog> {
     Result totalEmail(String emailId);

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<SysEmail> {

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<SysServer> {

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;

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;

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;

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;

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;

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.*;

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;

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.*;

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.*;