Merge pull request 'station' (#3) from station into main

jeecg-boot-base-core/pom.xml

@@ -252,6 +252,11 @@
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
 		</dependency>
+		<!--ftp依赖-->
+		<dependency>
+			<groupId>commons-net</groupId>
+			<artifactId>commons-net</artifactId>
+			<version>3.3</version>
+		</dependency>
 	</dependencies>
-
 </project>

jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/EmailConstant.java

@@ -0,0 +1,9 @@
+package org.jeecg.common.constant;
+
+/**
+ * 邮件服务常量
+ */
+public class EmailConstant {
+
+    public static final String EMAIL_STATUS_PREFIX = "email_status";
+}

jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java

@@ -0,0 +1,204 @@
+package org.jeecg.common.email;
+
+import com.google.common.collect.Lists;
+import com.sun.mail.imap.IMAPStore;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.email.emuns.MailContentType;
+import org.jeecg.modules.base.entity.SysEmail;
+import org.jetbrains.annotations.NotNull;
+import javax.mail.*;
+import javax.mail.internet.MimeUtility;
+import java.io.*;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * 邮件服务管理器
+ */
+@Slf4j
+public class EmailServiceManager {
+
+    private SysEmail email;
+    /** 邮件接收数量 */
+    private Integer receiveNum;
+    /** smtp协议的存储对象 */
+    private IMAPStore store = null;
+    /** 邮件附件临时存储路径 */
+    private String temporaryStoragePath;
+    /** 收件箱 */
+    private Folder folder = null;
+
+    @NotNull
+    public static EmailServiceManager getInstance(){
+        return new EmailServiceManager();
+    }
+
+    /**
+     * 初始化邮件服务管理器
+     * @param email 邮件属性
+     */
+    public void init(SysEmail email){
+        this.email = email;
+    }
+
+    /**
+     * 初始化邮件服务管理器
+     * @param email 邮件属性
+     */
+    public void init(SysEmail email,Integer receiveNum,String temporaryStoragePath){
+        this.email = email;
+        this.receiveNum = receiveNum;
+        this.temporaryStoragePath = temporaryStoragePath;
+    }
+
+    /**
+     * 测试邮件服务连通性
+     */
+    public boolean testConnectEmailServer(){
+        Socket socket = new Socket();
+        boolean flag = false;
+        try {
+            socket.connect(new InetSocketAddress(email.getEmailServerAddress(),email.getPort()),5000);
+            log.info("{}邮件服务连接测试成功",email.getEmailServerAddress());
+            flag = true;
+        } catch (IOException e) {
+            log.error("{}邮件服务连接测试失败，请检查邮件服务属性配置是否正确或邮件服务未开启，原因{}",email.getEmailServerAddress(),e.getMessage());
+        }finally {
+            try {
+                if(null != socket){
+                    socket.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return flag;
+    }
+
+    /**
+     * 接收邮件
+     */
+    public Message[] receiveMail() throws MessagingException {
+        //配置邮件服务属性
+        Properties props = new Properties();
+        props.put("mail.store.protocol","imap");
+        props.put("mail.imap.host",email.getEmailServerAddress());
+        props.put("mail.imap.port",email.getPort());
+        //获取邮件回话
+        final Session session = Session.getInstance(props, new Authenticator() {
+            @Override
+            protected PasswordAuthentication getPasswordAuthentication() {
+            return new PasswordAuthentication(email.getUsername(), email.getPassword());
+            }
+        });
+        Map<String, String> iam = new HashMap<>();
+        iam.put("name", "myname");
+        iam.put("version", "1.0.0");
+        iam.put("vendor", "myclient");
+        iam.put("support-email", "testmail@test.com");
+        //获取smtp协议的存储对象
+        store = (IMAPStore) session.getStore();
+        //连接
+        store.connect();
+        store.id(iam);
+        //获取收件箱
+        folder = store.getFolder("INBOX");
+        folder.open(Folder.READ_WRITE);
+        //获取邮件数量
+        final int messageCount = folder.getMessageCount();
+        if(messageCount > 0){
+            Integer start = 1;
+            Integer end = this.receiveNum>messageCount?messageCount:this.receiveNum;
+            final Message[] messages = folder.getMessages(start,end);
+            return messages;
+        }
+        return null;
+    }
+
+    /**
+     * 获取邮件内容
+     * @param part
+     * @return
+     * @throws MessagingException
+     * @throws IOException
+     */
+    public void getMailContent(@NotNull Part part, StringBuilder content) throws MessagingException, IOException {
+        Multipart multipart = (Multipart) part.getContent();
+        for(int i=0;i<multipart.getCount();i++) {
+            final Part bodyPart = multipart.getBodyPart(i);
+            if(bodyPart.isMimeType(MailContentType.PLAIN.getContentType())){
+                content.append(bodyPart.getContent().toString());
+            }else if(bodyPart.isMimeType(MailContentType.RELATED.getContentType()) || bodyPart.isMimeType(MailContentType.ALTERNATIVE.getContentType())){
+                getMailContent(bodyPart,content);
+            }
+        }
+    }
+
+    /**
+     * 保存邮件附件
+     * @param part
+     * @throws MessagingException
+     * @throws IOException
+     */
+    public List<String> saveAttachment(@NotNull Part part) throws MessagingException, IOException {
+        List<String> filePathList = Lists.newArrayList();
+        Multipart multipart = (Multipart) part.getContent();
+        for(int i=0;i<multipart.getCount();i++){
+            final BodyPart bodyPart = multipart.getBodyPart(i);
+            if(Part.ATTACHMENT.equalsIgnoreCase(bodyPart.getDisposition())){
+                BufferedInputStream bis = null;
+                BufferedOutputStream bos = null;
+                try{
+                    final String fileName = MimeUtility.decodeText(bodyPart.getFileName());
+                    bis = new BufferedInputStream(bodyPart.getInputStream());
+                    File file = new File(this.temporaryStoragePath+File.separator+fileName);
+                    bos = new BufferedOutputStream(new FileOutputStream(file));
+                    byte[] buf = new byte[4096];
+                    int len;
+                    while(-1 != (len = bis.read(buf,0,buf.length))){
+                        bos.write(buf,0,buf.length);
+                    }
+                    filePathList.add(file.getAbsolutePath());
+                }finally {
+                    if(null != bis){
+                        bis.close();
+                    }
+                    if(null != bos){
+                        bos.flush();
+                        bos.close();
+                    }
+                }
+            }
+        }
+        return filePathList;
+    }
+
+    /**
+     * 删除邮件
+     * @param message
+     * @throws MessagingException
+     */
+    public void removeMail(@NotNull Message message) throws MessagingException {
+        message.setFlag(Flags.Flag.DELETED,true);
+    }
+
+    /**
+     * 关闭邮件服务连接资源
+     */
+    public void close(){
+        try {
+            if(null != folder){
+                folder.close();
+            }
+            if(null != store){
+                store.close();
+            }
+        } catch (MessagingException e) {
+            e.printStackTrace();
+        }
+    }
+}

jeecg-boot-base-core/src/main/java/org/jeecg/common/email/emuns/MailContentType.java

@@ -0,0 +1,43 @@
+package org.jeecg.common.email.emuns;
+
+/**
+ * 邮件类型
+ * @author 86187
+ */
+public enum MailContentType {
+
+    /**
+     * 该类型表示带附件的邮件，在邮件正文中包含了其他类型文件的附件，
+     * 例如 PDF 文件、Word 文档、图像、音频和视频等。
+     */
+    MIXED("multipart/mixed"),
+    /**
+     * 该类型表示多部分邮件，其中包含了邮件正文的不同版本。通常情况下，这种邮件类型包含两个部分：
+     * 一个是纯文本格式的正文，另一个则是 HTML 格式的正文。
+     * 邮件客户端将根据用户设置或者默认值来选择相应的正文版本进行展示。
+     */
+    ALTERNATIVE("multipart/alternative"),
+    /**
+     * 该类型也是多部分邮件，它一般用于邮件中嵌入的图片、音频、视频等附件的展示。在该类型邮件中，图片等资源作为与 HTML 文档相关联的部分进行传输，
+     * 并且采用相对 URL 指向这些资源，以确保在不同设备上展示正文时不会出现问题。
+     */
+    RELATED("multipart/related"),
+    /**
+     * 该类型表示 HTML 格式的邮件，在邮件中可以包含各种样式和格式信息，例如字体、颜色、图像、链接等。
+     */
+    HTML("text/html"),
+    /**
+     * 该类型表示纯文本邮件，在邮件中只包含纯文本，不包含格式化信息。
+     */
+    PLAIN("text/plain");
+
+    private final String contentType;
+
+    MailContentType(String contentType) {
+        this.contentType = contentType;
+    }
+
+    public String getContentType(){
+        return this.contentType;
+    }
+}

jeecg-boot-base-core/src/main/java/org/jeecg/common/email/emuns/SysMailType.java

@@ -0,0 +1,26 @@
+package org.jeecg.common.email.emuns;
+
+/**
+ * 邮件类型
+ */
+public enum SysMailType {
+
+    /**
+     * 接收邮件
+     */
+    RECEIVE_EMAIL(1),
+    /**
+     * 发送邮件
+     */
+    SEND_EMAIL(2);
+
+    private Integer emailType;
+
+    SysMailType(int emailType) {
+        this.emailType = emailType;
+    }
+
+    public Integer getEmailType(){
+        return this.emailType;
+    }
+}

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java

@@ -0,0 +1,263 @@
+package org.jeecg.common.util;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import lombok.extern.slf4j.Slf4j;
+import net.sf.saxon.trans.SymbolicName;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.net.ftp.FTP;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPFile;
+import org.apache.commons.net.ftp.FTPReply;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+@Component
+@Slf4j
+public class FTPUtil {
+
+    @Value("${ftp.host}")
+    private String host;
+
+    @Value("${ftp.port}")
+    private Integer port;
+
+    @Value("${ftp.userName}")
+    private String userName;
+
+    @Value("${ftp.password}")
+    private String password;
+
+    @Value("${ftp.encoding}")
+    private String encoding;
+
+    /**
+     *  登录ftp
+     * @return
+     */
+    public FTPClient LoginFTP(){
+        //声明FTP客户端
+        FTPClient ftp = new FTPClient();
+        try {
+            // 切换为本地被动模式，可以解决FTP上传后文件为空的问题，但需要服务器将FTP服务添加至防火墙白名单
+            ftp.enterLocalPassiveMode();
+            //连接
+            ftp.connect(host, port);
+            //登录
+            ftp.login(userName, password);
+            //判断是否连接成功
+            int reply = ftp.getReplyCode();
+            if (!FTPReply.isPositiveCompletion(reply)) {
+                ftp.disconnect();
+                return null;
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return ftp;
+    }
+
+    public void downloadFTPFile(String localPath, String fileName, HttpServletResponse response) {
+        InputStream in = null;
+        ServletOutputStream out = null;
+        FTPClient ftpClient = this.LoginFTP();
+        if (Objects.isNull(ftpClient)){
+            throw new RuntimeException("ftp连接失败!");
+        }
+        //传输模式
+        try {
+            List<String> paths = Arrays.asList(localPath.split("/"));
+            if (CollectionUtils.isNotEmpty(paths)){
+                for (String workPath:paths) {
+                    //切换工作文件路径
+                    ftpClient.changeWorkingDirectory(workPath);
+                }
+            }
+            ftpClient.enterLocalPassiveMode();
+            ftpClient.setFileType(FTPClient.BINARY_FILE_TYPE);
+            // 设置编码，当文件中存在中文且上传后文件乱码时可使用此配置项
+            ftpClient.setControlEncoding(encoding);
+            ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE);
+            List<FTPFile> ftpFiles = Arrays.asList(ftpClient.listFiles());
+            if (CollectionUtils.isNotEmpty(ftpFiles)){
+                for (FTPFile ftpFile:ftpFiles) {
+                    if (ftpFile.getName().equals(fileName)){
+                        in = ftpClient.retrieveFileStream(new String(fileName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1));
+                    }
+                }
+            }
+            //重置响应信息
+            response.reset();
+            //设置响应类型
+            response.setContentType("application/download");
+            //解决中文不能生成文件
+            response.setHeader("Content-Disposition", "attachment; fileName=" + URLEncoder.encode(fileName,"UTF-8"));
+            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+            //获取输出流
+            out = response.getOutputStream();
+            //声明一个长度参数
+            int len;
+            //声明字节数组
+            byte[] bytes = new byte[1024];
+            //判断如果输入流的字节长度不等于-1，进行字节数组内容的读取
+            while ((len = in.read(bytes)) != -1) {
+                out.write(bytes, 0, len);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            try {
+                out.flush();
+                if (out != null) {
+                    out.close();
+                }
+                if (in != null) {
+                    in.close();
+                }
+                if (ftpClient != null){
+                    ftpClient.disconnect();
+                }
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    /**
+     * 检查目录是否存在，不存在则创建，支持递归创建
+     * @param path 目录路径
+     * @return 返回值true/false
+     */
+    public boolean checkDirectory(String path) {
+        final FTPClient ftpClient = this.LoginFTP();
+        try {
+            final boolean flag = this.checkDirectory(ftpClient, path);
+            return flag;
+        }catch (IOException e){
+            e.printStackTrace();
+            return false;
+        }finally {
+            try {
+                ftpClient.disconnect();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * 检查目录是否存在，不存在则创建，支持递归创建
+     * @param ftpClient FTP客户端
+     * @param path 目录路径
+     * @return 返回值true/false
+     * @throws IOException
+     */
+    private boolean checkDirectory(FTPClient ftpClient,String path) throws IOException {
+        final String rootPath = ftpClient.printWorkingDirectory();
+        final boolean changeFlag = ftpClient.changeWorkingDirectory(rootPath);
+        if(!changeFlag){
+            log.error("{}，根目录切换失败",rootPath);
+            return false;
+        }
+        String[] directories = path.split("/");
+        for(String directory : directories){
+            if(StringUtils.isEmpty(directory)){
+                 continue;
+            }
+            if(!ftpClient.changeWorkingDirectory(directory)){
+                if(!ftpClient.makeDirectory(directory)){
+                    log.error("{}，目录创建失败",directory);
+                    return false;
+                }
+                if(!ftpClient.changeWorkingDirectory(directory)){
+                    log.error("{}，目录切换失败",directory);
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 写入文件，若文件或文件目录不存在则自行创建
+     * @param filePath 文件路径
+     * @param fileName 文件名称
+     * @param inputStream 文件输入流
+     * @return 返回值true/false
+     */
+    public boolean saveFile(String filePath,String fileName,InputStream inputStream){
+        final FTPClient ftpClient = this.LoginFTP();
+        try{
+            final boolean flag = this.checkDirectory(ftpClient,filePath);
+            if(flag){
+                ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
+                String encodedName = new String(fileName.getBytes(StandardCharsets.UTF_8),StandardCharsets.ISO_8859_1);
+                final boolean result = ftpClient.storeFile(encodedName, inputStream);
+                return result;
+            }
+        }catch (IOException e){
+            log.error("{}文件创建失败，原因为：{}",filePath+"/"+fileName,e.getMessage());
+            e.printStackTrace();
+            return false;
+        }finally {
+            try {
+                ftpClient.disconnect();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 删除文件
+     * @param filePath 文件路径
+     * @param fileName 文件名称
+     * @return 返回值true/false
+     */
+    public boolean removeFile(String filePath,String fileName){
+        final FTPClient ftpClient = this.LoginFTP();
+        try {
+            final String rootPath = ftpClient.printWorkingDirectory();
+            final boolean changeFlag = ftpClient.changeWorkingDirectory(rootPath);
+            if(!changeFlag){
+                log.error("{}，根目录切换失败",rootPath);
+                return false;
+            }
+            String[] directories = filePath.split("/");
+            for(String directory : directories){
+                if(StringUtils.isEmpty(directory)){
+                    continue;
+                }
+                if(!ftpClient.changeWorkingDirectory(directory)){
+                    log.error("此文件目录不存在：{}",filePath);
+                    return false;
+                }
+            }
+            boolean result = ftpClient.deleteFile(new String(fileName.getBytes(StandardCharsets.UTF_8),StandardCharsets.ISO_8859_1));
+            if(!result){
+                log.error("此文件不存在：{}",filePath+"/"+fileName);
+            }
+            return result;
+        } catch (IOException e) {
+            log.error("{}文件删除失败，原因为：{}",filePath,e.getMessage());
+            e.printStackTrace();
+            return false;
+        }finally {
+            try {
+                ftpClient.disconnect();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+}

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsMetData.java

@@ -0,0 +1,100 @@
+package org.jeecg.modules.base.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName(value = "gards_met_data")
+public class GardsMetData implements Serializable {
+
+    /**
+     *  台站id
+     */
+    @TableField(value = "STATION_ID")
+    private Integer stationId;
+
+    /**
+     *  台站编码
+     */
+    @TableField(value = "STATION_CODE")
+    private String stationCode;
+
+    /**
+     *  气象数据id
+     */
+    @TableField(value = "MET_ID")
+    private Integer metId;
+
+    /**
+     *  开始时间
+     */
+    @TableField(value = "START_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    /**
+     *  结束时间
+     */
+    @TableField(value = "END_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    /**
+     *  平均湿度（％）
+     */
+    @TableField(value = "AVE_HUMIDITY")
+    private Integer aveHumidity;
+
+    /**
+     *  平均温度（℃）
+     */
+    @TableField(value = "AVGTEMPERATURE")
+    private Integer avgtemperature;
+
+    /**
+     *  平均压力（hPa）
+     */
+    @TableField(value = "AVE_PRESSURE")
+    private Integer avePressure;
+
+    /**
+     *  平均风向（偏离正北的度数）
+     */
+    @TableField(value = "AVE_WIND_DIR")
+    private Integer aveWindDir;
+
+    /**
+     *  平均风速（m/s）
+     */
+    @TableField(value = "AVE_WIND_SPEED")
+    private Integer aveWindSpeed;
+
+    /**
+     *  降雨量（mm）
+     */
+    @TableField(value = "RAINFALL")
+    private Integer rainfall;
+
+    /**
+     *  文件路径
+     */
+    @TableField(value = "INPUT_FILE_NAME")
+    private String inputFileName;
+
+    /**
+     *  操作时间
+     */
+    @TableField(value = "MODDATE")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
+
+}

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.system.entity;
+package org.jeecg.modules.base.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -13,77 +13,147 @@ import java.util.Date;
 @TableName("GARDS_SAMPLE_DATA")
 public class GardsSampleData implements Serializable {
 
+    /**
+     *  探测器编码
+     */
     @TableField(value = "SITE_DET_CODE")
     private String siteDetCode;
 
+    /**
+     *  样品id
+     */
     @TableField(value = "SAMPLE_ID")
     private Integer sampleId;
 
+    /**
+     *  台站id
+     */
     @TableField(value = "STATION_ID")
     private Integer stationId;
 
+    /**
+     *  探测器id
+     */
     @TableField(value = "DETECTOR_ID")
     private Integer detectorId;
 
+    /**
+     *  导入文件名称
+     */
     @TableField(value = "INPUT_FILE_NAME")
     private String inputFileName;
 
+    /**
+     *  系统类型（P : particulate; B :gas with 3-D β-γ coincidence detection; G :all other gas systems (high-resolution
+     * γ-spectrometry or 2-D β-γ coincidence
+     * detection)）
+     */
     @TableField(value = "SAMPLE_TYPE")
     private String sampleType;
 
+    /**
+     *  数据类型（S：SAMPLEPHD
+     * B：BLANKPHD
+     * D：DETBKPHD
+     * G：GASBKPHD
+     * C：CALIBPHD
+     * Q：QCPHD）
+     */
     @TableField(value = "DATA_TYPE")
     private String dataType;
 
+    /**
+     *  几何尺寸
+     */
     @TableField(value = "GEOMETRY")
     private String geometry;
 
+    /**
+     *  能谱限定符: 过程谱(PREL) 和 全谱(FULL)
+     */
     @TableField(value = "SPECTRAL_QUALIFIE")
     private String spectralQualifie;
 
+    /**
+     *  报文发送日期
+     */
     @TableField(value = "TRANSMIT_DTG")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date transmitDtg;
 
+    /**
+     *  样品采集开始时间
+     */
     @TableField(value = "COLLECT_START")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date collectStart;
 
+    /**
+     *  样品采集结束时间
+     */
     @TableField(value = "COLLECT_STOP")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date collectStop;
 
+    /**
+     *  样品测量开始时间
+     */
     @TableField(value = "ACQUISITION_START")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date acquisitionStart;
 
+    /**
+     *  样品测量结束时间
+     */
     @TableField(value = "ACQUISITION_STOP")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date acquisitionStop;
 
+    /**
+     *  能谱获取实时间
+     */
     @TableField(value = "ACQUISITION_REAL_SEC")
     private Double acquisitionRealSec;
 
+    /**
+     *  能谱获取活时间
+     */
     @TableField(value = "ACQUISITION_LIVE_SEC")
     private Double acquisitionLiveSec;
 
+    /**
+     *  采样量（立方米）
+     */
     @TableField(value = "QUANTITY")
     private Double quantity;
 
+    /**
+     *  样品处理状态
+     */
     @TableField(value = "STATUS")
     private String status;
 
+    /**
+     *  操作时间
+     */
     @TableField(value = "MODDATE")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date moddate;
 
+    /**
+     *  台站名称
+     */
     @TableField(exist = false)
     private String stationName;
 
+    /**
+     *  探测器名称
+     */
     @TableField(exist = false)
     private String detectorsName;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSohData.java

@@ -0,0 +1,90 @@
+package org.jeecg.modules.base.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName(value = "gards_soh_data")
+public class GardsSohData implements Serializable {
+
+    /**
+     * 台站ID号
+     */
+    @TableField(value = "STATION_ID")
+    private Integer stationId;
+
+    /**
+     *  台站代码
+     */
+    @TableField(value = "STATION_CODE")
+    private String stationCode;
+
+    /**
+     *  报警ID号
+     */
+    @TableField(value = "SOH_ID")
+    private Integer sohId;
+
+    /**
+     *  状态数据采集开始时间
+     */
+    @TableField(value = "START_TIME")
+    private Date startTime;
+
+    /**
+     *  时间间隔长度（秒）
+     */
+    @TableField(value = "TIME")
+    private Integer time;
+
+    /**
+     *  采样流速均值（scm/h）
+     */
+    @TableField(value = "AVGFLOWRATE")
+    private Integer avgflowrate;
+
+    /**
+     *  采样流速偏差（scm/h）
+     */
+    @TableField(value = "FLOWRATEDEV")
+    private Integer flowratedev;
+
+    /**
+     *  文件路径
+     */
+    @TableField(value = "INPUT_FILE_NAME")
+    private String inputFileName;
+
+    /**
+     *  探测器id
+     */
+    @TableField(value = "DETECTOR_ID")
+    private Integer detectorId;
+
+    /**
+     *  操作时间
+     */
+    @TableField(value = "MODDATE")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
+
+    /**
+     *  台站名称
+     */
+    @TableField(exist = false)
+    private String stationName;
+
+    /**
+     *  探测器名称
+     */
+    @TableField(exist = false)
+    private String detectorName;
+
+}

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java

@@ -0,0 +1,95 @@
+package org.jeecg.modules.base.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.Date;
+
+/**
+ * 邮件管理数据表
+ */
+@Data
+@TableName(value = "sys_email")
+public class SysEmail implements Serializable {
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * email服务地址
+     */
+    @TableField(value = "email_server_address")
+    private String emailServerAddress;
+
+    /**
+     * 邮箱类型（1-收件地址，2-发件地址）
+     */
+    @TableField(value = "emil_type")
+    private Integer emilType;
+
+    /**
+     * 邮箱登录名称
+     */
+    @TableField(value = "username")
+    private String username;
+
+    /**
+     * 邮箱登录密码
+     */
+    @TableField(value = "password")
+    private String password;
+
+    /**
+     * 端口
+     */
+    @TableField(value = "port")
+    private Integer port;
+
+    /**
+     * 是否启用邮箱（0-不启用，1-启用）
+     */
+    @TableField(value = "enabled")
+    private Integer enabled;
+
+    /**
+     * 定时获取邮件时间周期(秒)
+     */
+    @TableField(value = "receive_mail_fixed_cycle")
+    private Integer receiveMailFixedCycle;
+
+    /**
+     * 创建日期
+     */
+    @TableField(value = "create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate createTime;
+
+    /**
+     * 创建人员
+     */
+    @TableField(value = "create_by")
+    private String createBy;
+
+    /**
+     * 修改日期
+     */
+    @TableField(value = "update_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate updateTime;
+
+    /**
+     * 修改人员
+     */
+    @TableField(value = "update_by")
+    private String updateBy;
+
+}

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmailLog.java

@@ -0,0 +1,58 @@
+package org.jeecg.modules.base.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 邮件接收日志数据表
+ */
+@Data
+@TableName(value = "sys_email_log")
+public class SysEmailLog implements Serializable {
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 邮件id
+     */
+    @TableField(value = "email_id")
+    private String emailId;
+
+    /**
+     * 邮件主题
+     */
+    @TableField(value = "subject")
+    private String subject;
+
+    /**
+     * 邮件内容
+     */
+    @TableField(value = "context")
+    private String context;
+
+    /**
+     * 接收时间
+     */
+    @TableField(value = "receive_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date receiveTime;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+}

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/struct/EnergySpectrumStruct.java

@@ -0,0 +1,363 @@
+package org.jeecg.modules.base.struct;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 能谱结构体字段信息
+ */
+@Data
+public class EnergySpectrumStruct implements Serializable {
+
+    /************************* Infomations ******************/
+    /**
+     * 消息类型
+     */
+    private String msg_type;
+    /**
+     * 消息id
+     */
+    private String msg_id;
+    /**
+     * 数据类型
+     */
+    private String data_type;
+
+    /************************* Header Black ******************/
+    /**
+     * designator
+     */
+    private String designator;
+    /**
+     * site code
+     */
+    private String site_code;
+    /**
+     * detector code
+     */
+    private String detector_code;
+    /**
+     * system type: P for particulate; B for gas with 3-D  β - γ coincidence detection; and
+     */
+    private String system_type;
+    /**
+     * sample geometry
+     */
+    private String sample_geometry;
+    /**
+     * spectrum qualifier: preliminary ( PREL )or full ( FULL)
+     */
+    private String spectrum_quantity;
+    /**
+     * sample reference identification
+     */
+    private String sample_ref_id;
+    /**
+     * measurement identification
+     */
+    private String measurement_id;
+    /**
+     * detector background measurement identification
+     */
+    private String detector_bk_measurement_id;
+    /**
+     * gas background measurement identification (memory effect)
+     */
+    private String gas_bk_measurement_id;
+    /**
+     * transmit date (yyyy / mm / dd)
+     */
+    private String transmit_date;
+    /**
+     * transmit time (hh : mm : ss . s)
+     */
+    private String transmit_time;
+
+    /************************* Comment ******************/
+    private String comment;
+
+    /************************* Acquisition Block ******************/
+    /**
+     * acquisition start date (yyyy / mm / dd)
+     */
+    private String acquisition_start_date;
+    /**
+     * acquisition start time (hh : mm : ss . s)
+     */
+    private String acquisition_start_time;
+    /**
+     * acquisition real time (s)
+     */
+    private Double acquisition_real_time;
+    /**
+     * acquisition live time (s)
+     */
+    private Double acquisition_live_time;
+
+    /************************* Collection Block ******************/
+
+    /**
+     * collection start date (yyyy / mm / dd)
+     */
+    private String collection_start_date;
+    /**
+     * collection start time (hh : mm : ss . s)
+     */
+    private String collection_start_time;
+    /**
+     * collection stop date (yyyy / mm / dd)
+     */
+    private String collection_stop_date;
+    /**
+     * collection stop time (hh : mm : ss . s)
+     */
+    private String collection_stop_time;
+    /**
+     *  total air volume sampled (standard cubic meters [scm])
+     */
+    private Double air_volume;
+
+    /************************* Processing Block ******************/
+    /**
+     * sample volume of Xe (cm 3 )
+     */
+    private Double sample_volume_of_Xe;
+    /**
+     * uncertainty (cm 3 )
+     */
+    private Double uncertainty_1;
+    /**
+     * Xe collection yield (Xe gas in sample/total Xe gas sampled)
+     */
+    private Double Xe_collection_yield;
+    /**
+     * uncertainty (Xe gas in sample/total Xe gas sampled)
+     */
+    private Double uncertainty_2;
+    /**
+     * archive bottle identification
+     */
+    private String archive_bottle_id;
+
+    /************************* Calibration Block ******************/
+    /**
+     * date of last calibration (yyyy / mm / dd)
+     */
+    private String date_calibration;
+    /**
+     * time of last calibration (hh : mm : ss)
+     */
+    private String time_calibration;
+
+    /************************* g_Energy Block ******************/
+    /**
+     * γ -energy (keV)
+     */
+    private List<Double> g_energy;
+    /**
+     * centroid channel
+     */
+    private List<Double> g_centroid_channel;
+    /**
+     * uncertainty (channels)
+     */
+    private List<Double> g_uncertainty;
+
+    private Integer g_record_count;
+
+    /************************* b_Energy Block ******************/
+    /**
+     *  electron energy (keV)
+     */
+    private List<Double> b_electron_energy;
+    /**
+     * decay mode descriptor: B for β-particle, C for conversion electron (CE)
+     */
+    private List<String> b_decay_mode;
+    /**
+     *  maximum channel of β-particle distribution or centroid channel of CE (channels)
+     */
+    private List<Double> b_channel;
+    /**
+     * uncertainty (channels)
+     */
+    private List<Double> b_uncertainty;
+
+    private Integer b_record_count;
+
+    /************************* g_Resolution Block ******************/
+    /**
+     * γ -energy (keV)
+     */
+    private List<Double> g_r_energy;
+    /**
+     * FWHM (keV)
+     */
+    private List<Double> g_r_FWHM;
+    /**
+     * uncertainty (keV)
+     */
+    private List<Double> g_r_uncertainty;
+
+    private Integer g_r_record_count;
+
+    /************************* b_Resolution Block ******************/
+    /**
+     * electron energy (keV)
+     */
+    private List<Double> b_r_electron_energy;
+    /**
+     * FWHM (keV)
+     */
+    private List<Double> b_r_FWHM;
+    /**
+     * uncertainty (keV)
+     */
+    private List<Double> b_r_uncertainty;
+
+    private Integer b_r_record_count;
+
+    /************************* g_Efficiency Block ******************/
+    /**
+     * γ -energy (keV)
+     */
+    private List<Double> g_e_energy;
+    /**
+     * efficiency (counts in peak/photon emitted)
+     */
+    private List<Double> g_e_efficiency;
+    /**
+     * uncertainty (counts in peak/photon emitted)
+     */
+    private List<Double> g_e_uncertainty;
+
+    private Integer g_e_record_count;
+
+    /************************* ROI_Limits Block ******************/
+    /**
+     * ROI number
+     */
+    private List<String> ROI_number;
+    /**
+     * 2-D ROI β-range start, x 1 (keV)
+     */
+    private List<Double> POI_B_x1;
+    /**
+     * 2-D ROI β-range stop, x 2 (keV)
+     */
+    private List<Double> POI_B_x2;
+    /**
+     * 2-D ROI γ-range start, y 1 (keV)
+     */
+    private List<Double> POI_G_y1;
+    /**
+     * 2-D ROI γ-range stop, y 2 (keV)
+     */
+    private List<Double> POI_G_y2;
+
+    private Integer roi_record_count;
+
+    /************************* b-gEfficiency Block ******************/
+    /**
+     *  nuclide name
+     */
+    private List<String> bg_nuclide_name;
+    /**
+     * ROI number
+     */
+    private List<String> bg_ROI_number;
+    /**
+     * β-γ coincidence efficiency (counts in ROI/β-γ pair emitted)
+     */
+    private List<Double> bg_efficiency;
+    /**
+     * uncertainty (counts in ROI/β-γ pair emitted)
+     */
+    private List<Double> bg_uncertainty;
+
+    private Integer bg_record_count;
+
+    /************************* Ratios Block ******************/
+    /**
+     * ratio identifier
+     */
+    private List<String> ratio_id;
+    /**
+     * ROI number for the higher  γ -energy ROI
+     */
+    private List<String> ROI_num_highter_G_energy_ROI;
+    /**
+     * ROI number for the lower  γ -energy ROI
+     */
+    private List<String> ROI_num_lower_G_energy_ROI;
+    /**
+     * Q_DECLARE_METATYPE(RMSSOHData::HeaderBlock)count ratio(counts in higher  γ -energy ROI/counts in lower  γ -energy ROI)
+     */
+    private List<Double> count_ratio;
+    /**
+     * count ratio uncertainty (percent)
+     */
+    private List<Double> count_ratio_uncertainty;
+
+    private Integer ratio_record_count;
+
+    /************************* g_Spectrum Block ******************/
+    /**
+     * number of  γ channels
+     */
+    private Long num_g_channel;
+    /**
+     * γ-energy span (keV)
+     */
+    private Long g_energy_span;
+    /**
+     * begin  of channels
+     */
+    private Long g_begin_channel;
+    /**
+     * count at channel
+     */
+    private List<Long> g_counts;
+
+    /************************* b_Spectrum Block ******************/
+    /**
+     * number of  β -channels
+     */
+    private Long num_b_channel;
+    /**
+     * β -energy span (keV)
+     */
+    private Long b_energy_span;
+    /**
+     * begin  of channels
+     */
+    private Long b_begin_channel;
+    /**
+     * counts at channels
+     */
+    private List<Long> b_counts;
+
+    /************************* Histogram Block ******************/
+    /**
+     * β-channels
+     */
+    private Long b_channels;
+    /**
+     * γ-channels
+     */
+    private Long g_channels;
+    /**
+     * β-energy span
+     */
+    private Long b_h_energy_span;
+    /**
+     * γ-energy span
+     */
+    private Long g_h_energy_span;
+    /**
+     * counts at channels
+     */
+    private List<Long> h_counts;
+}

jeecg-module-abnormal-alarm/pom.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.jeecgframework.boot</groupId>
+        <artifactId>jeecg-boot-parent</artifactId>
+        <version>3.5.1</version>
+    </parent>
+
+    <artifactId>jeecg-module-abnormal-alarm</artifactId>
+
+    <properties>
+        <hutool.version>5.8.19</hutool.version>
+    </properties>
+
+    <dependencies>
+        <!-- jeecg-system-cloud-api -->
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-system-cloud-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-base-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-starter-cloud</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java

@@ -0,0 +1,48 @@
+package org.jeecg.modules.controller;
+
+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.IAlarmContactGroupService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("alarmContactGroup")
+public class AlarmContactGroupController {
+
+    @Autowired
+    private IAlarmContactGroupService alarmContactGroupService;
+
+    @GetMapping("findPage")
+    @ApiOperation(value = "分页查询报警联系人组信息", notes = "分页查询报警联系人组信息")
+    public Result findPage(QueryRequest queryRequest, AlarmContactGroup alarmContactGroup){
+        return alarmContactGroupService.findPage(queryRequest, alarmContactGroup);
+    }
+
+    @GetMapping("findInfo")
+    @ApiOperation(value = "查询报警联系人组信息详情", notes = "查询报警联系人组信息详情")
+    public Result findInfo(String id){
+        return alarmContactGroupService.findInfo(id);
+    }
+
+    @PostMapping("create")
+    @ApiOperation(value = "新增报警人联系人组", notes = "新增报警联系人组")
+    public Result create(@RequestBody AlarmContactGroup alarmContactGroup){
+        return alarmContactGroupService.create(alarmContactGroup);
+    }
+
+    @PutMapping("update")
+    @ApiOperation(value = "修改报警人联系人组", notes = "修改报警联系人组")
+    public Result update(@RequestBody AlarmContactGroup alarmContactGroup){
+        return alarmContactGroupService.update(alarmContactGroup);
+    }
+
+    @DeleteMapping("deleteById")
+    @ApiOperation(value = "删除报警人联系人组", notes = "删除报警联系人组")
+    public Result deleteById(String id){
+        return alarmContactGroupService.deleteById(id);
+    }
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java

@@ -0,0 +1,85 @@
+package org.jeecg.modules.controller;
+
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.QueryRequest;
+import org.jeecg.common.api.dto.message.MessageDTO;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.enums.MessageTypeEnum;
+import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.modules.entity.AlarmLog;
+import org.jeecg.modules.service.IAlarmLogService;
+import org.jeecg.modules.vo.AlarmVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("alarmLog")
+public class AlarmLogController {
+
+    @Autowired
+    private IAlarmLogService alarmLogService;
+
+    @Autowired
+    private ISysBaseAPI sysBaseAPI;
+
+    @ApiOperation("报警日志量总览-柱状图")
+    @PostMapping("viewAll")
+    public Result viewAll(@RequestBody AlarmVo alarmVo){ return alarmLogService.viewAll(alarmVo); }
+    @ApiOperation("分页查询报警日志信息")
+    @PostMapping("findPage")
+    public Result findPage(@RequestBody AlarmVo alarmVo){
+        return alarmLogService.findPage(alarmVo);
+    }
+    @ApiOperation("各类型报警量统计-饼图")
+    @PostMapping("typeAlarms")
+    public Result typeAlarms(@RequestBody AlarmVo alarmVo){
+        return alarmLogService.typeAlarms(alarmVo);
+    }
+    @ApiOperation("报警规则top5-柱状图")
+    @PostMapping("ruleTop")
+    public Result ruleTop5(@RequestBody AlarmVo alarmVo){
+        return alarmLogService.ruleTop5(alarmVo);
+    }
+
+    @GetMapping("findInfo")
+    @ApiOperation(value = "查询报警日志信息详情", notes = "查询报警日志信息详情")
+    public Result findInfo(String id){
+        return alarmLogService.findInfo(id);
+    }
+
+    @PostMapping("create")
+    @ApiOperation(value = "新增报警日志", notes = "新增报警日志")
+    public Result create(@RequestBody AlarmLog alarmLog){
+        return alarmLogService.create(alarmLog);
+    }
+
+    @PutMapping("update")
+    @ApiOperation(value = "修改报警日志", notes = "修改报警日志")
+    public Result update(@RequestBody AlarmLog alarmLog){
+        return alarmLogService.update(alarmLog);
+    }
+
+    @DeleteMapping("deleteById")
+    @ApiOperation(value = "删除报警日志", notes = "删除报警日志")
+    public Result deleteById(String id){
+        return alarmLogService.deleteById(id);
+    }
+
+    @GetMapping("test")
+    public void test(){
+        MessageDTO message = new MessageDTO();
+        message.setFromUser("admin");
+        message.setToUser("nieziyan");
+        message.setTitle("测试消息");
+        message.setType(MessageTypeEnum.XT.getType());
+        message.setTemplateCode("SYS001");
+        Map<String,Object> data = new HashMap<>();
+        data.put("userName","聂子炎");
+        data.put("taskName","请假申请");
+        message.setData(data);
+        sysBaseAPI.sendTemplateMessage(message);
+    }
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java

@@ -0,0 +1,51 @@
+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.AlarmRule;
+import org.jeecg.modules.service.IAlarmRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("alarmRule")
+@Api(value = "报警规则管理", tags = "报警规则管理")
+public class AlarmRuleController {
+
+    @Autowired
+    private IAlarmRuleService alarmRuleService;
+
+    @GetMapping("findPage")
+    @ApiOperation(value = "分页查询报警规则信息", notes = "分页查询报警规则信息")
+    public Result findPage(QueryRequest queryRequest, AlarmRule alarmRule){
+        return alarmRuleService.findPage(queryRequest, alarmRule);
+    }
+
+    @GetMapping("findInfo")
+    @ApiOperation(value = "查看规则信息详情", notes = "查看规则信息详情")
+    public Result findInfo(String id){
+        return alarmRuleService.findInfo(id);
+    }
+
+    @PostMapping("create")
+    @ApiOperation(value = "新增规则信息", notes = "新增规则信息")
+    public Result create(@RequestBody AlarmRule alarmRule){
+        return alarmRuleService.create(alarmRule);
+    }
+
+    @PutMapping("update")
+    @ApiOperation(value = "修改规则信息", notes = "修改规则信息")
+    public Result update(@RequestBody AlarmRule alarmRule){
+        return alarmRuleService.update(alarmRule);
+    }
+
+    @DeleteMapping("deleteById")
+    @ApiOperation(value = "删除规则信息", notes = "删除规则信息")
+    public Result deleteById(String id){
+        return alarmRuleService.deleteById(id);
+    }
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java

@@ -0,0 +1,61 @@
+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.SysDatabase;
+import org.jeecg.modules.service.ISysDatabaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Date;
+
+@RestController
+@RequestMapping("sysDatabase")
+@Api(value = "数据库配置管理", tags = "数据库配置管理")
+public class SysDatabaseController {
+
+    @Autowired
+    private ISysDatabaseService sysDatabaseService;
+
+    @GetMapping("findPage")
+    @ApiOperation(value = "分页查询数据库配置信息", notes = "分页查询数据库配置信息")
+    public Result findPage(QueryRequest queryRequest, SysDatabase sysDatabase){
+        return sysDatabaseService.findPage(queryRequest, sysDatabase);
+    }
+
+    @GetMapping("findInfo")
+    @ApiOperation(value = "查询数据库配置信息详情", notes = "查询数据库配置信息详情")
+    public Result findInfo(String id){
+        return sysDatabaseService.findInfo(id);
+    }
+
+    @PostMapping("create")
+    @ApiOperation(value = "新增数据库配置信息", notes = "新增数据库配置信息")
+    public Result create(@RequestBody SysDatabase sysDatabase){
+        return sysDatabaseService.create(sysDatabase);
+    }
+
+    @PutMapping("update")
+    @ApiOperation(value = "修改数据库配置信息", notes = "修改数据库配置信息")
+    public Result update(@RequestBody SysDatabase sysDatabase){
+        return sysDatabaseService.update(sysDatabase);
+    }
+
+    @DeleteMapping("deleteById")
+    @ApiOperation(value = "删除数据库配置信息", notes = "删除数据库配置信息")
+    public Result deleteById(String id){
+        return sysDatabaseService.deleteById(id);
+    }
+
+    @GetMapping("findAlarmHistory")
+    @ApiOperation(value = "查询数据库历史报警信息", notes = "查询数据库历史报警信息")
+    public Result findAlarmHistory(String databaseId,
+           @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){
+        return sysDatabaseService.findAlarmHistory(databaseId, startTime, endTime);
+    }
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java

@@ -0,0 +1,60 @@
+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.base.entity.SysEmail;
+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;
+
+@RestController
+@RequestMapping("sysEmail")
+@Api(value = "邮箱配置信息管理", tags = "邮箱配置信息管理")
+public class SysEmailController {
+
+    @Autowired
+    private ISysEmailService sysEmailService;
+
+    @GetMapping("findPage")
+    @ApiOperation(value = "分页查询邮箱配置信息", notes = "分页查询邮箱配置信息")
+    public Result findPage(QueryRequest queryRequest, SysEmail sysEmail){
+        return sysEmailService.findPage(queryRequest, sysEmail);
+    }
+
+    @GetMapping("findInfo")
+    @ApiOperation(value = "查询邮箱配置信息详情", notes = "查询邮箱配置信息详情")
+    public Result findInfo(String id){
+        return sysEmailService.findInfo(id);
+    }
+
+    @PostMapping("create")
+    @ApiOperation(value = "新增邮箱配置信息", notes = "新增邮箱配置信息")
+    public Result create(@RequestBody SysEmail sysEmail){
+        return sysEmailService.create(sysEmail);
+    }
+
+    @PutMapping("update")
+    @ApiOperation(value = "修改邮箱配置信息", notes = "修改邮箱配置信息")
+    public Result update(@RequestBody SysEmail sysEmail){
+        return sysEmailService.update(sysEmail);
+    }
+
+    @DeleteMapping("deleteById")
+    @ApiOperation(value = "删除邮箱配置信息", notes = "删除邮箱配置信息")
+    public Result deleteById(String id){
+        return sysEmailService.deleteById(id);
+    }
+
+    @GetMapping("findAlarmHistory")
+    @ApiOperation(value = "查询邮箱历史报警信息", notes = "查询邮箱历史报警信息")
+    public Result findAlarmHistory(String emailId,
+                       @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){
+        return sysEmailService.findAlarmHistory(emailId, startTime, endTime);
+    }
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailLogController.java

@@ -0,0 +1,200 @@
+package org.jeecg.modules.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.EmailConstant;
+import org.jeecg.common.util.RedisUtil;
+import org.jeecg.modules.base.entity.SysEmailLog;
+import org.jeecg.modules.service.ISysEmailLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("sysEmailLog")
+@Api(value = "邮箱日志", tags = "邮箱日志")
+public class SysEmailLogController {
+    @Autowired
+    private ISysEmailLogService sysEmailLogService;
+
+    @Autowired
+    private RedisUtil redisUtil;
+
+    /**
+     * 邮箱服务器连接状态 正常/断开
+     *
+     * @param emailId 电子邮件id
+     */
+    @GetMapping("status")
+    public Result status(@RequestParam("emailId") String emailId){
+        String key = EmailConstant.EMAIL_STATUS_PREFIX;
+        Boolean emailSatus = (Boolean) redisUtil.hget(key, emailId);
+        return Result.OK(emailSatus == null ? false : emailSatus);
+    }
+
+    @GetMapping("space")
+    public Result space(@RequestParam("emailId") String emailId){
+        return null;
+    }
+
+    /**
+     * 分别获取今天、昨天、过去一周邮件量
+     *
+     * @param emailId 电子邮件id
+     */
+    @GetMapping("total")
+    public Result totalEmail(@RequestParam("emailId") String emailId){
+        // 当日邮件量
+        LambdaQueryWrapper<SysEmailLog> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysEmailLog::getEmailId,emailId);
+        LocalDate today = LocalDate.now();
+        String todayStart = today + " 00:00:00";
+        String todayEnd = today + " 23:59:59";
+        wrapper.between(SysEmailLog::getReceiveTime,todayStart,todayEnd);
+        Long todayCount = sysEmailLogService.count(wrapper);
+        // 昨日邮件量
+        wrapper.clear();
+        wrapper.eq(SysEmailLog::getEmailId,emailId);
+        LocalDate yesterday = LocalDate.now().minusDays(1);
+        String yesterdayStart = yesterday + " 00:00:00";
+        String yesterdayEnd = yesterday + " 23:59:59";
+        wrapper.between(SysEmailLog::getReceiveTime,yesterdayStart,yesterdayEnd);
+        Long yesterdayCount = sysEmailLogService.count(wrapper);
+        // 过去一周邮件量
+        wrapper.clear();
+        wrapper.eq(SysEmailLog::getEmailId,emailId);
+        LocalDate passWeek = LocalDate.now().minusWeeks(1);
+        String weekStart = passWeek + " 00:00:00";
+        wrapper.between(SysEmailLog::getReceiveTime,weekStart,todayEnd);
+        Long weekCount = sysEmailLogService.count(wrapper);
+
+        Map<String,Long> result = new HashMap<>();
+        result.put("today",todayCount);
+        result.put("yesterday",yesterdayCount);
+        result.put("week",weekCount);
+        return Result.OK(result);
+    }
+
+    /**
+     * 今天邮件接收量 按小时划分
+     *
+     * @param emailId 电子邮件id
+     */
+    @GetMapping("today")
+    public Result today(@RequestParam("emailId") String emailId){
+        LambdaQueryWrapper<SysEmailLog> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysEmailLog::getEmailId,emailId);
+        LocalDate today = LocalDate.now();
+        String todayStart = today + " 00:00:00";
+        String todayEnd = today + " 23:59:59";
+        wrapper.between(SysEmailLog::getReceiveTime,todayStart,todayEnd);
+        List<SysEmailLog> emailLogs = sysEmailLogService.list(wrapper);
+        // 将Date转换为LocalDateTime
+        List<Date> allDate = emailLogs.stream()
+                .map(SysEmailLog::getReceiveTime)
+                .collect(Collectors.toList());
+        List<LocalDateTime> allTime = allDate.stream()
+                .map(item -> {
+                    ZoneId zoneId = ZoneId.systemDefault();
+                    return item.toInstant()
+                            .atZone(zoneId)
+                            .toLocalDateTime();
+                })
+                .collect(Collectors.toList());
+        // 按照小时分组
+        Map<String,Integer> statistic = new TreeMap<>();
+        Map<Integer, List<LocalDateTime>> groupTime = allTime.stream()
+                .collect(Collectors.groupingBy(LocalDateTime::getHour));
+        for (int i = 0; i < 24; i++) {
+            if(groupTime.containsKey(i)){
+                Integer count = groupTime.get(i).size();
+                statistic.put(timeStr(i),count);
+            }else {
+                statistic.put(timeStr(i),0);
+            }
+        }
+        return Result.OK(statistic);
+    }
+
+    /**
+     * 根据日期筛选(折线图)
+     *
+     * @param emailId 电子邮件id
+     */
+    @GetMapping("analysis")
+    public Result analysis(@RequestParam("emailId") String emailId,
+                           @RequestParam("startDate") String startDate,
+                           @RequestParam("endDate") String endDate){
+        String startStr = startDate + " 00:00:00";
+        String endStr = endDate + " 23:59:59";
+        LambdaQueryWrapper<SysEmailLog> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysEmailLog::getEmailId,emailId);
+        wrapper.between(SysEmailLog::getReceiveTime,startStr,endStr);
+        Set<String> xData = new HashSet<>();
+        Collection<Integer> yData = new ArrayList<>();
+        Map<String,Integer> statistic = new TreeMap<>();
+        Map<String,Object> result = new HashMap<>();
+        List<Date> allDate = sysEmailLogService.listObjs(wrapper,
+                emailLog -> ((SysEmailLog) emailLog).getReceiveTime());
+        // 将Date转换为LocalDateTime
+        List<LocalDateTime> allTime = allDate.stream()
+                .map(item -> {
+                    ZoneId zoneId = ZoneId.systemDefault();
+                    return item.toInstant()
+                            .atZone(zoneId)
+                            .toLocalDateTime();
+                })
+                .collect(Collectors.toList());
+        if (CollUtil.isEmpty(allDate)){
+            result.put("xData",xData);
+            result.put("yData",yData);
+            return Result.OK(result);
+        }
+
+        /* 支持跨年跨月选择 */
+        // 通过年月日进行分组 例:2023-06-06
+        DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE;
+        Map<String, List<LocalDateTime>> group = allTime.stream()
+                .collect(Collectors.groupingBy(datetime -> datetime.format(formatter)));
+
+        // 列举出startDate-endDate中所有日期(包括闰年)
+        // 没有邮件的日期,对应的值设置为0
+        LocalDate start = LocalDate.parse(startDate);
+        LocalDate end = LocalDate.parse(endDate);
+        while (!start.isAfter(end)) {
+            String key = start.format(formatter);
+            if (group.containsKey(key)){
+                Integer count = group.get(key).size();
+                statistic.put(key,count);
+            }else {
+                statistic.put(key,0);
+            }
+            start = start.plusDays(1);
+        }
+        // 返回结果
+        xData = statistic.keySet();
+        yData = statistic.values();
+        result.put("xData",xData);
+        result.put("yData",yData);
+        return Result.OK(result);
+    }
+
+    private String timeStr(Integer time){
+        if (time < 10){
+            return "0" + time + ":00";
+        }
+        return time + ":00";
+    }
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java

@@ -0,0 +1,60 @@
+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.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;
+
+@RestController
+@RequestMapping("sysServer")
+@Api(value = "服务器配置信息管理", tags = "服务器配置信息管理")
+public class SysServerController {
+
+    @Autowired
+    private ISysServerService sysServerService;
+
+    @GetMapping("findPage")
+    @ApiOperation(value = "分页查询服务器数据", notes = "分页查询服务器数据")
+    public Result findPage(QueryRequest queryRequest, SysServer sysServer){
+        return sysServerService.findPage(queryRequest, sysServer);
+    }
+
+    @GetMapping("findInfo")
+    @ApiOperation(value = "服务器数据详情信息", notes = "服务器数据详情信息")
+    public Result findInfo(String id){
+        return sysServerService.findInfo(id);
+    }
+
+    @PostMapping("create")
+    @ApiOperation(value = "新增服务器数据信息", notes = "新增服务器数据信息")
+    public Result create(@RequestBody SysServer sysServer){
+        return sysServerService.create(sysServer);
+    }
+
+    @PutMapping("update")
+    @ApiOperation(value = "修改服务器数据信息", notes = "修改服务器数据信息")
+    public Result update(@RequestBody SysServer sysServer){
+        return sysServerService.update(sysServer);
+    }
+
+    @DeleteMapping("deleteById")
+    @ApiOperation(value = "删除服务器数据信息", notes = "删除服务器数据信息")
+    public Result deleteById(String id){
+        return sysServerService.deleteById(id);
+    }
+
+    @GetMapping("findAlarmHistory")
+    @ApiOperation(value = "查询服务器历史报警信息", notes = "查询服务器历史报警信息")
+    public Result findAlarmHistory(String serverId,
+               @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,@DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){
+        return sysServerService.findAlarmHistory(serverId, startTime, endTime);
+    }
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/dto/TypeDto.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.dto;
+
+import lombok.Data;
+
+@Data
+public class TypeDto {
+    // 1.资源类型 Server|Database|Email
+    // 2.规则名
+    private String name;
+    // 1.报警量
+    // 2.规则使用量
+    private Integer value;
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroup.java

@@ -0,0 +1,83 @@
+package org.jeecg.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+@TableName(value = "alarm_contact_group")
+public class AlarmContactGroup implements Serializable {
+
+    /**
+     *  id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     *  联系人组名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     *  联系人组描述
+     */
+    @TableField(value = "description")
+    private String description;
+
+    /**
+     *  创建时间
+     */
+    @TableField(value = "create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate createTime;
+
+    /**
+     *  创建人
+     */
+    @TableField(value = "create_by")
+    private String createBy;
+
+    /**
+     *  修改时间
+     */
+    @TableField(value = "update_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate updateTime;
+
+    /**
+     *  修改人
+     */
+    @TableField(value = "update_by")
+    private String updateBy;
+
+    /**
+     *  联系人组关联的用户id
+     */
+    @TableField(exist = false)
+    List<String> userIds;
+
+    /**
+     *  联系人组关联的用户集合
+     */
+    @TableField(exist = false)
+    List<SysUser> users;
+
+    /**
+     *  当前联系人组人员数量
+     */
+    @TableField(exist = false)
+    Integer personNumber;
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroupMember.java

@@ -0,0 +1,33 @@
+package org.jeecg.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@TableName(value = "alarm_contact_group_member")
+public class AlarmContactGroupMember implements Serializable {
+
+    /**
+     *  id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     *  联系人组id
+     */
+    @TableField(value = "group_id")
+    private String groupId;
+
+    /**
+     *  用户id
+     */
+    @TableField(value = "user_id")
+    private String userId;
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmHistory.java

@@ -0,0 +1,38 @@
+package org.jeecg.modules.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+@Data
+public class AlarmHistory {
+
+    /**
+     *  名称
+     */
+    private String name;
+
+    /**
+     *  报警开始时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate alarmStartDate;
+
+    /**
+     *  报警详情
+     */
+    private String alarmInfo;
+
+    /**
+     *  规则信息
+     */
+    private String operator;
+
+    /**
+     *  来源类型
+     */
+    private String sourceType;
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmLog.java

@@ -0,0 +1,44 @@
+package org.jeecg.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@TableName(value = "alarm_log")
+public class AlarmLog implements Serializable {
+
+    /**
+     *  id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     *  规则id
+     */
+    @TableField(value = "rule_id")
+    private String ruleId;
+
+    /**
+     *  报警开始时间
+     */
+    @TableField(value = "alarm_start_date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime alarmStartDate;
+
+    /**
+     *  报警详情
+     */
+    @TableField(value = "alarm_info")
+    private String alarmInfo;
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmRule.java

@@ -0,0 +1,100 @@
+package org.jeecg.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+@Data
+@TableName(value = "alarm_rule")
+public class AlarmRule implements Serializable {
+
+    /**
+     *  id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     *  名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     *  规则信息
+     */
+    @TableField(value = "operator")
+    private String operator;
+
+    /**
+     *  沉默周期，单位为秒
+     */
+    @TableField(value = "silence_cycle")
+    private Integer silenceCycle;
+
+    /**
+     *  报警通知方式，如短信、邮件等
+     */
+    @TableField(value = "notification")
+    private String notification;
+
+    /**
+     *  是否启用该报警规则（0-未启用，1-启用）
+     */
+    @TableField(value = "enabled")
+    private Integer enabled;
+
+    /**
+     *  报警联系人组id
+     */
+    @TableField(value = "contact_id")
+    private String contactId;
+
+    /**
+     *  资源id
+     */
+    @TableField(value = "source_id")
+    private String sourceId;
+
+    /**
+     *  资源类型
+     */
+    @TableField(value = "source_type")
+    private String sourceType;
+
+    /**
+     *  创建时间
+     */
+    @TableField(value = "create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate createTime;
+
+    /**
+     *  创建人
+     */
+    @TableField(value = "create_by")
+    private String createBy;
+
+    /**
+     *  修改时间
+     */
+    @TableField(value = "update_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate updateTime;
+
+    /**
+     *  修改人
+     */
+    @TableField(value = "update_by")
+    private String updateBy;
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysDatabase.java

@@ -0,0 +1,94 @@
+package org.jeecg.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+@Data
+@TableName(value = "sys_database")
+public class SysDatabase implements Serializable {
+
+    /**
+     *  id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     *  名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     *  状态（0-断开连接，1-连接成功）
+     */
+    @TableField(value = "status")
+    private Integer status;
+
+    /**
+     *  ip地址
+     */
+    @TableField(value = "ip_address")
+    private String ipAddress;
+
+    /**
+     *  端口
+     */
+    @TableField(value = "port")
+    private String port;
+
+    /**
+     *  用户名称
+     */
+    @TableField(value = "username")
+    private String username;
+
+    /**
+     *  密码
+     */
+    @TableField(value = "password")
+    private String password;
+
+    /**
+     *  数据库类型
+     */
+    @TableField(value = "type")
+    private String type;
+
+    /**
+     *  创建时间
+     */
+    @TableField(value = "create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate createTime;
+
+    /**
+     *  创建人
+     */
+    @TableField(value = "create_by")
+    private String createBy;
+
+    /**
+     *  修改时间
+     */
+    @TableField(value = "update_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate updateTime;
+
+    /**
+     *  修改人
+     */
+    @TableField(value = "update_by")
+    private String updateBy;
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysRole.java

@@ -0,0 +1,80 @@
+package org.jeecg.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 角色表
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+    
+    /**
+     * 角色名称
+     */
+    @Excel(name="角色名",width=15)
+    private String roleName;
+    
+    /**
+     * 角色编码
+     */
+    @Excel(name="角色编码",width=15)
+    private String roleCode;
+    
+    /**
+          * 描述
+     */
+    @Excel(name="描述",width=60)
+    private String description;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**租户ID*/
+    private Integer tenantId;
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysServer.java

@@ -0,0 +1,70 @@
+package org.jeecg.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+@Data
+@TableName(value = "sys_server")
+public class SysServer implements Serializable {
+
+    /**
+     *  id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     *  名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     *  状态（0-停机，1-正常，2-故障）
+     */
+    @TableField(value = "status")
+    private Integer status;
+
+    /**
+     *  ip地址
+     */
+    @TableField(value = "ip_address")
+    private String ipAddress;
+
+    /**
+     *  创建时间
+     */
+    @TableField(value = "create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate createTime;
+
+    /**
+     *  创建人
+     */
+    @TableField(value = "create_by")
+    private String createBy;
+
+    /**
+     *  修改时间
+     */
+    @TableField(value = "update_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate updateTime;
+
+    /**
+     *  修改人
+     */
+    @TableField(value = "update_by")
+    private String updateBy;
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysUser.java

@@ -0,0 +1,208 @@
+package org.jeecg.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户表
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 登录账号
+     */
+    @Excel(name = "登录账号", width = 15)
+    private String username;
+
+    /**
+     * 真实姓名
+     */
+    @Excel(name = "真实姓名", width = 15)
+    private String realname;
+
+    /**
+     * 密码
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String password;
+
+    /**
+     * md5密码盐
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String salt;
+
+    /**
+     * 头像
+     */
+    @Excel(name = "头像", width = 15,type = 2)
+    private String avatar;
+
+    /**
+     * 生日
+     */
+    @Excel(name = "生日", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date birthday;
+
+    /**
+     * 性别（1：男 2：女）
+     */
+    @Excel(name = "性别", width = 15,dicCode="sex")
+    @Dict(dicCode = "sex")
+    private Integer sex;
+
+    /**
+     * 电子邮件
+     */
+    @Excel(name = "电子邮件", width = 15)
+    private String email;
+
+    /**
+     * 电话
+     */
+    @Excel(name = "电话", width = 15)
+    private String phone;
+
+    /**
+     * 登录选择部门编码
+     */
+    private String orgCode;
+    /**
+     * 登录选择租户ID
+     */
+    private Integer loginTenantId;
+
+    /**部门名称*/
+    private transient String orgCodeTxt;
+
+    /**
+     * 状态(1：正常  2：冻结 ）
+     */
+    @Excel(name = "状态", width = 15,dicCode="user_status")
+    @Dict(dicCode = "user_status")
+    private Integer status;
+
+    /**
+     * 删除状态（0，正常，1已删除）
+     */
+    @Excel(name = "删除状态", width = 15,dicCode="del_flag")
+    @TableLogic
+    private Integer delFlag;
+
+    /**
+     * 工号，唯一键
+     */
+    @Excel(name = "工号", width = 15)
+    private String workNo;
+
+    /**
+     * 职务，关联职务表
+     */
+    @Excel(name = "职务", width = 15)
+    @Dict(dictTable ="sys_position",dicText = "name",dicCode = "code")
+    private String post;
+
+    /**
+     * 座机号
+     */
+    @Excel(name = "座机号", width = 15)
+    private String telephone;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 同步工作流引擎1同步0不同步
+     */
+    private Integer activitiSync;
+
+    /**
+     * 身份（0 普通成员 1 上级）
+     */
+    @Excel(name="（1普通成员 2上级）",width = 15)
+    private Integer userIdentity;
+
+    /**
+     * 负责部门
+     */
+    @Excel(name="负责部门",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
+    @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
+    private String departIds;
+
+    /**
+     * 多租户ids临时用，不持久化数据库(数据库字段不存在)
+     */
+    @TableField(exist = false)
+    private String relTenantIds;
+
+    /**设备id uniapp推送用*/
+    private String clientId;
+
+    /**
+     * 登录首页地址
+     */
+    @TableField(exist = false)
+    private String homePath;
+
+    /**
+     * 职位名称
+     */
+    @TableField(exist = false)
+    private String postText;
+
+    @TableField(exist = false)
+    private List<SysRole> roles;
+
+    /**
+     * 流程状态
+     */
+    private String bpmStatus;
+}

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

@@ -0,0 +1,7 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.entity.AlarmContactGroup;
+
+public interface AlarmContactGroupMapper extends BaseMapper<AlarmContactGroup> {
+}

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

@@ -0,0 +1,7 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.entity.AlarmContactGroupMember;
+
+public interface AlarmContactGroupMemberMapper extends BaseMapper<AlarmContactGroupMember> {
+}

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

@@ -0,0 +1,23 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.dto.TypeDto;
+import org.jeecg.modules.entity.AlarmHistory;
+import org.jeecg.modules.entity.AlarmLog;
+import org.jeecg.modules.vo.AlarmVo;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public interface AlarmLogMapper extends BaseMapper<AlarmLog> {
+
+    List<LocalDateTime> rangeDay(Map<String,Object> params);
+    List<AlarmHistory> findPage(Map<String,Object> params);
+
+    List<TypeDto> typeAlarms(Map<String,Object> params);
+
+    List<TypeDto> ruleTop5(Map<String,Object> params);
+}

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

@@ -0,0 +1,7 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.entity.AlarmRule;
+
+public interface AlarmRuleMapper extends BaseMapper<AlarmRule> {
+}

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

@@ -0,0 +1,15 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.entity.AlarmHistory;
+import org.jeecg.modules.entity.SysDatabase;
+
+import java.util.Date;
+import java.util.List;
+
+public interface SysDatabaseMapper extends BaseMapper<SysDatabase> {
+
+    List<AlarmHistory> findAlarmHistory(@Param("databaseId") String databaseId, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+}

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.base.entity.SysEmailLog;
+
+/**
+ * 系统邮件日志
+ *
+ * @author nieziyan
+ * @date 2023-06-19
+ */
+public interface SysEmailLogMapper extends BaseMapper<SysEmailLog> {
+
+}

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

@@ -0,0 +1,15 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.entity.AlarmHistory;
+import org.jeecg.modules.base.entity.SysEmail;
+
+import java.util.Date;
+import java.util.List;
+
+public interface SysEmailMapper extends BaseMapper<SysEmail> {
+
+    List<AlarmHistory> findAlarmHistory( @Param("emailId") String emailId, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+}

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

@@ -0,0 +1,15 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.entity.AlarmHistory;
+import org.jeecg.modules.entity.SysServer;
+
+import java.util.Date;
+import java.util.List;
+
+public interface SysServerMapper extends BaseMapper<SysServer> {
+
+    List<AlarmHistory> findAlarmHistory(@Param("serverId")String serverId, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+}

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

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.mapper.AlarmLogMapper">
+    <select id="rangeDay" parameterType="Map" resultType="java.time.LocalDateTime">
+        SELECT
+            l.alarm_start_date
+        FROM
+            alarm_log l
+        INNER JOIN alarm_rule r ON l.rule_id = r.ID
+        <where>
+            <if test="type != null and type != ''">
+                r.source_type = #{type}
+            </if>
+            <if test="startDate != null and startDate != ''">
+                AND l.alarm_start_date &gt;= #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                AND l.alarm_start_date &lt;= #{endDate}
+            </if>
+        </where>
+    </select>
+    <select id="findPage" parameterType="Map" resultType="org.jeecg.modules.entity.AlarmHistory">
+        SELECT
+            *
+        FROM
+            (SELECT
+                 l.alarm_start_date,
+                 l.alarm_info,
+                 r.OPERATOR,
+                 r.source_type,
+                 CASE
+                     r.source_type
+                     WHEN 'Server' THEN
+                         ( SELECT NAME FROM sys_server comm WHERE ID = r.source_id )
+                     WHEN 'Database' THEN
+                         ( SELECT NAME FROM sys_database comm WHERE ID = r.source_id )
+                     WHEN 'Email' THEN
+                         ( SELECT NAME FROM sys_email WHERE ID = r.source_id )
+                     END AS NAME
+             FROM
+                 alarm_log l
+             INNER JOIN alarm_rule r ON l.rule_id = r.ID
+            ) AS res
+        <where>
+            <if test="type != null and type != ''">
+                source_type = #{type}
+            </if>
+            <if test="name != null and name != ''">
+                AND NAME LIKE concat ( '%', #{name} , '%' )
+            </if>
+            <if test="startDate != null and startDate != ''">
+                AND alarm_start_date &gt;= #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                AND alarm_start_date &lt;= #{endDate}
+            </if>
+        </where>
+        <if test="pageFlag == null">
+            LIMIT #{pageSize} OFFSET #{pageStart}
+        </if>
+    </select>
+    <select id="typeAlarms" parameterType="Map" resultType="org.jeecg.modules.dto.TypeDto">
+        SELECT
+            r.source_type AS name,
+            COUNT (r.source_type) AS value
+        FROM
+            alarm_log l
+        INNER JOIN alarm_rule r ON l.rule_id = r.ID
+        <where>
+            <if test="type != null and type != ''">
+                r.source_type = #{type}
+            </if>
+            <if test="startDate != null and startDate != ''">
+                AND l.alarm_start_date &gt;= #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                AND l.alarm_start_date &lt;= #{endDate}
+            </if>
+        </where>
+        GROUP BY r.source_type
+    </select>
+    <select id="ruleTop5" parameterType="Map" resultType="org.jeecg.modules.dto.TypeDto">
+        SELECT
+            r.name,
+            l.ruleCount AS value
+        FROM (
+            SELECT
+                rule_id,
+                COUNT (rule_id) AS ruleCount
+            FROM
+                alarm_log
+            <where>
+                <if test="startDate != null and startDate != ''">
+                    alarm_start_date &gt;= #{startDate}
+                </if>
+                <if test="endDate != null and endDate != ''">
+                    AND alarm_start_date &lt;= #{endDate}
+                </if>
+            </where>
+            GROUP BY rule_id
+            LIMIT 5
+        ) AS l
+        INNER JOIN alarm_rule r ON l.rule_id = r.id
+        <where>
+            <if test="type != null and type != ''">
+                r.source_type = #{type}
+            </if>
+        </where>
+        ORDER BY l.ruleCount DESC
+    </select>
+</mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.mapper.SysEmailLogMapper">
+
+</mapper>

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.mapper.SysEmailMapper">
+
+    <select id="findAlarmHistory" resultType="org.jeecg.modules.entity.AlarmHistory">
+        SELECT
+        se.name,
+        l.alarm_start_date,
+        l.alarm_info,
+        r.operator
+        FROM
+        sys_email se
+        inner join alarm_rule r on r.source_id = se.id
+        inner join alarm_log l on l.rule_id = r.id
+        <where>
+            l.alarm_start_date between #{startDate} and #{endDate}
+            <if test=" emailId != null and emailId != '' ">
+                and se.id = #{emailId}
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.mapper.SysServerMapper">
+
+    <select id="findAlarmHistory" resultType="org.jeecg.modules.entity.AlarmHistory">
+        SELECT
+            se.name,
+            l.alarm_start_date,
+            l.alarm_info,
+            r.operator
+        FROM
+            sys_server se
+        inner join alarm_rule r on r.source_id = se.id
+        inner join alarm_log l on l.rule_id = r.id
+        <where>
+            l.alarm_start_date between #{startDate} and #{endDate}
+            <if test=" serverId != null and serverId != '' ">
+                and se.id = #{serverId}
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.mapper.SysDatabaseMapper">
+
+    <select id="findAlarmHistory" resultType="org.jeecg.modules.entity.AlarmHistory">
+        SELECT
+        se.name,
+        l.alarm_start_date,
+        l.alarm_info,
+        r.operator
+        FROM
+        sys_database se
+        inner join alarm_rule r on r.source_id = se.id
+        inner join alarm_log l on l.rule_id = r.id
+        <where>
+            l.alarm_start_date between #{startDate} and #{endDate}
+            <if test=" databaseId != null and databaseId != '' ">
+                and se.id = #{databaseId}
+            </if>
+        </where>
+    </select>
+
+</mapper>

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java

@@ -0,0 +1,20 @@
+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;
+
+public interface IAlarmContactGroupService extends IService<AlarmContactGroup> {
+
+    Result findPage(QueryRequest queryRequest, AlarmContactGroup alarmContactGroup);
+
+    Result findInfo(String id);
+
+    Result create(AlarmContactGroup alarmContactGroup);
+
+    Result update(AlarmContactGroup alarmContactGroup);
+
+    Result deleteById(String id);
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmLogService.java

@@ -0,0 +1,28 @@
+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.AlarmLog;
+import org.jeecg.modules.vo.AlarmVo;
+
+public interface IAlarmLogService extends IService<AlarmLog> {
+
+    Result viewAll(AlarmVo alarmVo);
+
+    Result findPage(AlarmVo alarmVo);
+
+    Result typeAlarms(AlarmVo alarmVo);
+
+    Result ruleTop5(AlarmVo alarmVo);
+
+    Result findInfo(String id);
+
+    Result create(AlarmLog alarmLog);
+
+    Result update(AlarmLog alarmLog);
+
+    Result deleteById(String id);
+
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmRuleService.java

@@ -0,0 +1,20 @@
+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.AlarmRule;
+
+public interface IAlarmRuleService extends IService<AlarmRule> {
+
+    Result findPage(QueryRequest queryRequest, AlarmRule alarmRule);
+
+    Result findInfo(String id);
+
+    Result create(AlarmRule alarmRule);
+
+    Result update(AlarmRule alarmRule);
+
+    Result deleteById(String id);
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmSysUserService.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.service;
+
+import org.jeecg.modules.entity.SysUser;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.Map;
+
+@Component
+@FeignClient(value = "jeecg-system")
+public interface IAlarmSysUserService {
+
+    @RequestMapping("/sys/user/findUserMap")
+    Map<String, SysUser> findUserMap();
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java

@@ -0,0 +1,25 @@
+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.SysDatabase;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+public interface ISysDatabaseService extends IService<SysDatabase> {
+
+    Result findPage(QueryRequest queryRequest, SysDatabase sysDatabase);
+
+    Result findInfo(String id);
+
+    Result create(SysDatabase sysDatabase);
+
+    Result update(SysDatabase sysDatabase);
+
+    Result deleteById(String id);
+
+    Result findAlarmHistory(String databaseId, Date startTime, Date endTime);
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailLogService.java

@@ -0,0 +1,7 @@
+package org.jeecg.modules.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.base.entity.SysEmailLog;
+
+public interface ISysEmailLogService extends IService<SysEmailLog> {
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java

@@ -0,0 +1,24 @@
+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 java.util.Date;
+
+public interface ISysEmailService extends IService<SysEmail> {
+
+    Result findPage(QueryRequest queryRequest, SysEmail sysEmail);
+
+    Result findInfo(String id);
+
+    Result create(SysEmail sysEmail);
+
+    Result update(SysEmail sysEmail);
+
+    Result deleteById(String id);
+
+    Result findAlarmHistory(String emailId, Date startTime, Date endTime);
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysServerService.java

@@ -0,0 +1,24 @@
+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.SysServer;
+
+import java.util.Date;
+
+public interface ISysServerService extends IService<SysServer> {
+
+    Result findPage(QueryRequest queryRequest, SysServer sysServer);
+
+    Result findInfo(String id);
+
+    Result create(SysServer sysServer);
+
+    Result update(SysServer sysServer);
+
+    Result deleteById(String id);
+
+    Result findAlarmHistory(String serverId, Date startTime, Date endTime);
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.mapper.AlarmContactGroupMapper;
+import org.jeecg.modules.mapper.AlarmContactGroupMemberMapper;
+import org.jeecg.modules.service.IAlarmContactGroupService;
+import org.jeecg.modules.service.IAlarmSysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service("alarmContactGroupService")
+public class AlarmContactGroupServiceImpl extends ServiceImpl<AlarmContactGroupMapper, AlarmContactGroup> implements IAlarmContactGroupService {
+
+    @Autowired
+    private AlarmContactGroupMemberMapper alarmContactGroupMemberMapper;
+    @Autowired
+    private IAlarmSysUserService alarmSysUserService;
+
+    @Override
+    public Result findPage(QueryRequest queryRequest, AlarmContactGroup alarmContactGroup) {
+        Result result = new Result();
+        //获取用户信息
+        Map<String ,SysUser> userList = alarmSysUserService.findUserMap();
+        Page<AlarmContactGroup> page = new Page<>();
+        LambdaQueryWrapper<AlarmContactGroup> queryWrapper = new LambdaQueryWrapper<>();
+        Page<AlarmContactGroup> alarmContactGroupPage = this.baseMapper.selectPage(page, queryWrapper);
+        LambdaQueryWrapper<AlarmContactGroupMember> contactGroupMemberQueryWrapper = new LambdaQueryWrapper<>();
+        List<AlarmContactGroupMember> alarmContactGroupMembers = alarmContactGroupMemberMapper.selectList(contactGroupMemberQueryWrapper);
+        alarmContactGroupPage.getRecords().forEach(item->{
+            List<SysUser> sysUsers = new LinkedList<>();
+            //联系人组对应联系人信息不为空
+            if (CollectionUtils.isNotEmpty(alarmContactGroupMembers)){
+                //根据联系人组id过滤出对应的联系人信息集合
+                List<AlarmContactGroupMember> contactGroupMembers = alarmContactGroupMembers.stream().filter(member-> member.getGroupId().equals(item.getId())).collect(Collectors.toList());
+                item.setPersonNumber(contactGroupMembers.size());
+                //过滤出对应的用户id集合
+                List<String> userIds = contactGroupMembers.stream().map(AlarmContactGroupMember::getUserId).collect(Collectors.toList());
+                //根据用户id获得对应的用户信息
+                if (CollectionUtils.isNotEmpty(userList)){
+                    for (String userId:userIds) {
+                        if (userList.containsKey(userId)){
+                            sysUsers.add(userList.get(userId));
+                        }
+                    }
+                    item.setUsers(sysUsers);
+                }
+            }
+        });
+        result.setSuccess(true);
+        result.setResult(alarmContactGroupPage);
+        return result;
+    }
+
+    @Override
+    public Result findInfo(String id) {
+        Result result = new Result();
+        //根据id查询对应的数据  判断数据是否在数据库中
+        LambdaQueryWrapper<AlarmContactGroup> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AlarmContactGroup::getId, id);
+        AlarmContactGroup alarmContactGroup = this.baseMapper.selectOne(queryWrapper);
+        if (Objects.isNull(alarmContactGroup)){
+            result.error500("查询数据失败，对应数据不存在");
+            return result;
+        }
+        //通过联系人组id查询出对应的联系人信息
+        LambdaQueryWrapper<AlarmContactGroupMember> contactGroupMemberQueryWrapper = new LambdaQueryWrapper<>();
+        contactGroupMemberQueryWrapper.eq(AlarmContactGroupMember::getGroupId, alarmContactGroup.getId());
+        List<AlarmContactGroupMember> contactGroupMembers = alarmContactGroupMemberMapper.selectList(contactGroupMemberQueryWrapper);
+        if (CollectionUtils.isNotEmpty(contactGroupMembers)){
+            List<String> userIds = contactGroupMembers.stream().map(AlarmContactGroupMember::getUserId).collect(Collectors.toList());
+            alarmContactGroup.setUserIds(userIds);
+        }
+        result.setSuccess(true);
+        result.setResult(alarmContactGroup);
+        return result;
+    }
+
+    @Override
+    public Result create(AlarmContactGroup alarmContactGroup) {
+        Result result = new Result();
+        //获取request
+        HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
+        //获取当前操作人用户名
+        String username = JwtUtil.getUserNameByToken(request);
+        Long id = IdWorker.getId();
+        alarmContactGroup.setId(id.toString());
+        alarmContactGroup.setCreateTime(LocalDate.now());
+        alarmContactGroup.setCreateBy(username);
+        if (CollectionUtils.isNotEmpty(alarmContactGroup.getUserIds())){
+            List<String> userIds = alarmContactGroup.getUserIds();
+            for (String userId:userIds) {
+                Long memberId = IdWorker.getId();
+                AlarmContactGroupMember alarmContactGroupMember = new AlarmContactGroupMember();
+                alarmContactGroupMember.setId(memberId.toString());
+                alarmContactGroupMember.setGroupId(alarmContactGroup.getId());
+                alarmContactGroupMember.setUserId(userId);
+                alarmContactGroupMemberMapper.insert(alarmContactGroupMember);
+            }
+        }
+        result.setSuccess(true);
+        result.success("新增成功");
+        return result;
+    }
+
+    @Override
+    public Result update(AlarmContactGroup alarmContactGroup) {
+        Result result = new Result();
+        //获取request
+        HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
+        //获取当前操作人用户名
+        String username = JwtUtil.getUserNameByToken(request);
+        LambdaQueryWrapper<AlarmContactGroup> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AlarmContactGroup::getId, alarmContactGroup.getId());
+        AlarmContactGroup contactGroup = this.baseMapper.selectOne(queryWrapper);
+        if (Objects.isNull(contactGroup)){
+            result.error500("对应数据不存在");
+            return result;
+        }
+        if (CollectionUtils.isNotEmpty(alarmContactGroup.getUserIds())){
+            LambdaQueryWrapper<AlarmContactGroupMember> contactGroupMemberQueryWrapper = new LambdaQueryWrapper<>();
+            contactGroupMemberQueryWrapper.eq(AlarmContactGroupMember::getGroupId, alarmContactGroup.getId());
+            alarmContactGroupMemberMapper.delete(contactGroupMemberQueryWrapper);
+            List<String> userIds = alarmContactGroup.getUserIds();
+            for (String userId:userIds) {
+                Long memberId = IdWorker.getId();
+                AlarmContactGroupMember alarmContactGroupMember = new AlarmContactGroupMember();
+                alarmContactGroupMember.setId(memberId.toString());
+                alarmContactGroupMember.setGroupId(alarmContactGroup.getId());
+                alarmContactGroupMember.setUserId(userId);
+                alarmContactGroupMemberMapper.insert(alarmContactGroupMember);
+            }
+        }
+        alarmContactGroup.setUpdateTime(LocalDate.now());
+        alarmContactGroup.setUpdateBy(username);
+        this.baseMapper.updateById(alarmContactGroup);
+        result.setSuccess(true);
+        result.success("修改成功");
+        return result;
+    }
+
+    @Override
+    public Result deleteById(String id) {
+        Result result = new Result();
+        //根据联系人组id删除关联的联系人信息
+        LambdaQueryWrapper<AlarmContactGroupMember> contactGroupMemberQueryWrapper = new LambdaQueryWrapper<>();
+        contactGroupMemberQueryWrapper.eq(AlarmContactGroupMember::getGroupId, id);
+        alarmContactGroupMemberMapper.delete(contactGroupMemberQueryWrapper);
+        //删除联系人组信息
+        this.baseMapper.deleteById(id);
+        result.setSuccess(true);
+        result.success("删除成功");
+        return result;
+    }
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmLogServiceImpl.java

@@ -0,0 +1,239 @@
+package org.jeecg.modules.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+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.modules.dto.TypeDto;
+import org.jeecg.modules.entity.AlarmHistory;
+import org.jeecg.modules.entity.AlarmLog;
+import org.jeecg.modules.mapper.AlarmLogMapper;
+import org.jeecg.modules.service.IAlarmLogService;
+import org.jeecg.modules.vo.AlarmVo;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service("alarmLogService")
+public class AlarmLogServiceImpl extends ServiceImpl<AlarmLogMapper, AlarmLog> implements IAlarmLogService {
+
+    /**
+     * 总体统计柱状图
+     * @param alarmVo
+     * @return
+     */
+    @Override
+    public Result viewAll(AlarmVo alarmVo) {
+        String startDate = alarmVo.getStartDate();
+        String endDate = alarmVo.getEndDate();
+        // 拼接日期为合理的日期+时间范围
+        alarmVo.setStartDate(startDate + " 00:00:00");
+        alarmVo.setEndDate(endDate + " 23:59:59");
+        // 定义返回结果
+        Set<String> xData = new HashSet<>();
+        Collection<Integer> yData = new ArrayList<>();
+        Map<String,Integer> statistic = new TreeMap<>();
+        Map<String,Object> result = new HashMap<>();
+        // 转换参数 数据查询
+        Map<String, Object> params = BeanUtil.beanToMap(alarmVo);
+        List<LocalDateTime> allDate = baseMapper.rangeDay(params);
+        // 查询数据为空则直接返回空集合
+        if (CollUtil.isEmpty(allDate)){
+            result.put("xData",xData);
+            result.put("yData",yData);
+            return Result.OK(result);
+        }
+        // 分情况处理 1.按小时统计 2.按天统计
+
+        /* 1.选择日期为同一天 按照小时划分 0-23小时 */
+        if (startDate.equals(endDate)){
+            Map<Integer, List<LocalDateTime>> groupTime = allDate.stream()
+                    .collect(Collectors.groupingBy(LocalDateTime::getHour));
+            for (int i = 0; i < 24; i++) {
+                if(groupTime.containsKey(i)){
+                    Integer count = groupTime.get(i).size();
+                    statistic.put(timeStr(i),count);
+                }else {
+                    statistic.put(timeStr(i),0);
+                }
+            }
+            // 返回x轴和y轴数据
+            xData = statistic.keySet();
+            yData = statistic.values();
+            result.put("xData",xData);
+            result.put("yData",yData);
+            return Result.OK(result);
+        }
+        /* 2.选择日期不是同一天 按照天划分 */
+        // 支持跨年跨月选择(包括闰年)
+        else {
+            // 通过年月日进行分组 例:2023-06-06
+            DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE;
+            Map<String, List<LocalDateTime>> group = allDate.stream()
+                    .collect(Collectors.groupingBy(datetime -> datetime.format(formatter)));
+
+            // 列举startDate和endDate之间所有日期(已考虑闰年情况)
+            // 没有报警日志的日期,对应的值设置为0
+            LocalDate start = LocalDate.parse(startDate);
+            LocalDate end = LocalDate.parse(endDate);
+            while (!start.isAfter(end)) {
+                String key = start.format(formatter);
+                if (group.containsKey(key)){
+                    Integer count = group.get(key).size();
+                    statistic.put(key,count);
+                }else {
+                    statistic.put(key,0);
+                }
+                start = start.plusDays(1);
+            }
+            // 返回x轴和y轴数据
+            xData = statistic.keySet();
+            yData = statistic.values();
+            result.put("xData",xData);
+            result.put("yData",yData);
+            return Result.OK(result);
+        }
+    }
+
+    /**
+     * 报警信息分页列表
+     * @param alarmVo
+     * @return
+     */
+    @Override
+    public Result findPage(AlarmVo alarmVo) {
+        Integer pageNo = alarmVo.getPageNo();
+        Integer pageSize = alarmVo.getPageSize();
+        Page<AlarmHistory> page = new Page<>(pageNo,pageSize);
+        Integer pageStart = (pageNo - 1) * pageSize;
+        alarmVo.setPageStart(pageStart);
+        Map<String, Object> params = BeanUtil.beanToMap(alarmVo);
+        List<AlarmHistory> alarmHistories = baseMapper.findPage(params);
+        // 当前页数据
+        page.setRecords(alarmHistories);
+        // 获取数据总条数(经过查询条件过滤后的)
+        params.put("pageFlag","noPage");
+        Integer total = baseMapper.findPage(params).size();
+        page.setTotal(total);
+        return Result.OK(page);
+    }
+
+    /**
+     * ALARM ANALYSIS -> Monitor Type Alarms
+     * @return
+     */
+    @Override
+    public Result typeAlarms(AlarmVo alarmVo) {
+        /* 饼图数据 */
+        // 警报类型-警报数
+        Map<String, Object> params = BeanUtil.beanToMap(alarmVo);
+        List<TypeDto> typeAlarms = baseMapper.typeAlarms(params);
+        // 警报总数
+        Integer total = typeAlarms.stream().mapToInt(TypeDto::getValue).sum();
+        Map<String,Object> result = new HashMap<>();
+        result.put("pieData",typeAlarms);
+        result.put("pieTotal",total);
+        return Result.OK(result);
+    }
+
+    /**
+     * ALARM ANALYSIS -> Alarms Rule Top5
+     * @return
+     */
+    @Override
+    public Result ruleTop5(AlarmVo alarmVo) {
+        /* 柱状图数据 */
+        Map<String, Object> params = BeanUtil.beanToMap(alarmVo);
+        List<TypeDto> ruleTop5 = baseMapper.ruleTop5(params);
+        // x轴数据
+        List<String> xData = ruleTop5.stream()
+                .map(TypeDto::getName)
+                .collect(Collectors.toList());
+        // y轴数据
+        List<Integer> yData = ruleTop5.stream()
+                .map(TypeDto::getValue)
+                .collect(Collectors.toList());
+        Map<String,Object> result = new HashMap<>();
+        result.put("xData",xData);
+        result.put("yData",yData);
+        return Result.OK(result);
+    }
+
+    @Override
+    public Result findInfo(String id) {
+        Result result = new Result();
+        LambdaQueryWrapper<AlarmLog> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AlarmLog::getId, id);
+        AlarmLog alarmLog = this.baseMapper.selectOne(queryWrapper);
+        if (Objects.isNull(alarmLog)){
+            result.error500("当前查询数据不存在");
+            return result;
+        }
+        result.setSuccess(true);
+        result.setResult(alarmLog);
+        return result;
+    }
+
+    @Override
+    public Result create(AlarmLog alarmLog) {
+        Result result = new Result();
+        Long id = IdWorker.getId();
+        alarmLog.setId(id.toString());
+        if (StringUtils.isNotBlank(alarmLog.getAlarmInfo())){
+            String jsonString = JSON.toJSONString(alarmLog.getAlarmInfo());
+            alarmLog.setAlarmInfo(jsonString);
+        }
+        this.baseMapper.insert(alarmLog);
+        result.setSuccess(true);
+        result.success("新增成功");
+        return result;
+    }
+
+    @Override
+    public Result update(AlarmLog alarmLog) {
+        Result result = new Result();
+        LambdaQueryWrapper<AlarmLog> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AlarmLog::getId, alarmLog.getId());
+        AlarmLog log = this.baseMapper.selectOne(queryWrapper);
+        if (Objects.isNull(log)){
+            result.error500("对应数据不存在，修改失败");
+            return result;
+        }
+        if (StringUtils.isNotBlank(alarmLog.getAlarmInfo())){
+            String jsonString = JSON.toJSONString(alarmLog.getAlarmInfo());
+            alarmLog.setAlarmInfo(jsonString);
+        }
+        this.baseMapper.updateById(alarmLog);
+        result.setSuccess(true);
+        result.success("修改成功");
+        return result;
+    }
+
+    @Override
+    public Result deleteById(String id) {
+        Result result = new Result();
+        this.baseMapper.deleteById(id);
+        result.setSuccess(true);
+        result.success("删除成功");
+        return result;
+    }
+
+    private String timeStr(Integer time){
+        if (time < 10){
+            return "0" + time + ":00";
+        }
+        return time + ":00";
+    }
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java

@@ -0,0 +1,112 @@
+package org.jeecg.modules.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.netty.util.internal.StringUtil;
+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.AlarmRule;
+import org.jeecg.modules.mapper.AlarmRuleMapper;
+import org.jeecg.modules.service.IAlarmRuleService;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.Objects;
+
+@Service("alarmRuleService")
+public class AlarmRuleServiceImpl extends ServiceImpl<AlarmRuleMapper, AlarmRule> implements IAlarmRuleService {
+
+    @Override
+    public Result findPage(QueryRequest queryRequest, AlarmRule alarmRule) {
+        Result result = new Result();
+        Page<AlarmRule> page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize());
+        LambdaQueryWrapper<AlarmRule> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Objects.nonNull(alarmRule.getEnabled()), AlarmRule::getEnabled, alarmRule.getEnabled());
+        queryWrapper.eq(StringUtils.isNotBlank(alarmRule.getSourceId()), AlarmRule::getSourceId, alarmRule.getSourceId());
+        Page<AlarmRule> alarmRulePage = this.baseMapper.selectPage(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(alarmRulePage);
+        return result;
+    }
+
+    @Override
+    public Result findInfo(String id) {
+        Result result = new Result();
+        //根据id查询对应数据信息
+        LambdaQueryWrapper<AlarmRule> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AlarmRule::getId, id);
+        AlarmRule alarmRule = this.baseMapper.selectOne(queryWrapper);
+        if (Objects.isNull(alarmRule)){
+            result.error500("查询数据不存在");
+            return result;
+        }
+        result.setSuccess(true);
+        result.setResult(alarmRule);
+        return result;
+    }
+
+    @Override
+    public Result create(AlarmRule alarmRule) {
+        Result result = new Result();
+        //获取request
+        HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
+        //获取当前操作人用户名
+        String username = JwtUtil.getUserNameByToken(request);
+        Long id = IdWorker.getId();
+        alarmRule.setId(id.toString());
+        alarmRule.setCreateTime(LocalDate.now());
+        alarmRule.setCreateBy(username);
+        if (StringUtils.isNotBlank(alarmRule.getOperator())){
+            String jsonString = JSON.toJSONString(alarmRule.getOperator());
+            alarmRule.setOperator(jsonString);
+        }
+        this.baseMapper.insert(alarmRule);
+        result.setSuccess(true);
+        result.success("新增成功");
+        return result;
+    }
+
+    @Override
+    public Result update(AlarmRule alarmRule) {
+        Result result = new Result();
+        //获取request
+        HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
+        //获取当前操作人用户名
+        String username = JwtUtil.getUserNameByToken(request);
+        LambdaQueryWrapper<AlarmRule> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AlarmRule::getId, alarmRule.getId());
+        AlarmRule rule = this.baseMapper.selectOne(queryWrapper);
+        if (Objects.isNull(rule)){
+            result.error500("对应数据不存在");
+            return result;
+        }
+        alarmRule.setUpdateTime(LocalDate.now());
+        alarmRule.setUpdateBy(username);
+        if (StringUtils.isNotBlank(alarmRule.getOperator())){
+            String jsonString = JSON.toJSONString(alarmRule.getOperator());
+            alarmRule.setOperator(jsonString);
+        }
+        this.baseMapper.updateById(alarmRule);
+        result.setSuccess(true);
+        result.success("修改成功");
+        return result;
+    }
+
+    @Override
+    public Result deleteById(String id) {
+        Result result = new Result();
+        this.baseMapper.deleteById(id);
+        result.setSuccess(true);
+        result.success("删除成功");
+        return result;
+    }
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java

@@ -0,0 +1,132 @@
+package org.jeecg.modules.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.DateUtils;
+import org.jeecg.common.util.SpringContextUtils;
+import org.jeecg.modules.entity.AlarmHistory;
+import org.jeecg.modules.entity.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 javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Service("sysDatabaseService")
+public class SysDatabaseServiceImpl extends ServiceImpl<SysDatabaseMapper, SysDatabase> implements ISysDatabaseService {
+
+    @Override
+    public Result findPage(QueryRequest queryRequest, SysDatabase sysDatabase) {
+        Result result = new Result();
+        //声明page
+        Page<SysDatabase> page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize());
+        //分页查询数据库配置信息
+        LambdaQueryWrapper<SysDatabase> queryWrapper = new LambdaQueryWrapper<>();
+        Page<SysDatabase> sysDatabasePage = this.baseMapper.selectPage(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(sysDatabasePage);
+        return result;
+    }
+
+    @Override
+    public Result findInfo(String id) {
+        Result result = new Result();
+        LambdaQueryWrapper<SysDatabase> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysDatabase::getId, id);
+        SysDatabase database = this.baseMapper.selectOne(queryWrapper);
+        if (Objects.isNull(database)){
+            result.error500("当前数据不存在");
+            return result;
+        }
+        result.setSuccess(true);
+        result.setResult(database);
+        return result;
+    }
+
+    @Override
+    @Transactional
+    public Result create(SysDatabase sysDatabase) {
+        Result result  = new Result();
+        //获取request
+        HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
+        //获取当前操作人用户名
+        String username = JwtUtil.getUserNameByToken(request);
+        //声明id
+        Long id = IdWorker.getId();
+        sysDatabase.setId(id.toString());
+        sysDatabase.setCreateTime(LocalDate.now());
+        sysDatabase.setCreateBy(username);
+        this.baseMapper.insert(sysDatabase);
+        result.setSuccess(true);
+        result.success("新增成功");
+        return result;
+    }
+
+    @Override
+    @Transactional
+    public Result update(SysDatabase sysDatabase) {
+        Result result  = new Result();
+        //获取request
+        HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
+        //获取当前操作人用户名
+        String username = JwtUtil.getUserNameByToken(request);
+        LambdaQueryWrapper<SysDatabase> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysDatabase::getId, sysDatabase.getId());
+        SysDatabase database = this.baseMapper.selectOne(queryWrapper);
+        if (Objects.isNull(database)){
+            result.error500("对应数据不存在,修改失败");
+            return result;
+        }
+        sysDatabase.setUpdateTime(LocalDate.now());
+        sysDatabase.setUpdateBy(username);
+        this.baseMapper.updateById(sysDatabase);
+        result.setSuccess(true);
+        result.success("修改成功");
+        return result;
+    }
+
+    @Override
+    @Transactional
+    public Result deleteById(String id) {
+        Result result = new Result();
+        this.baseMapper.deleteById(id);
+        result.setSuccess(true);
+        result.success("删除成功");
+        return result;
+    }
+
+    @Override
+    public Result findAlarmHistory(String databaseId, Date startTime, Date endTime) {
+        Result result = new Result();
+        try {
+            if (Objects.isNull(startTime)){
+                result.error500("开始时间不能为空");
+                return result;
+            }
+            if (Objects.isNull(endTime)){
+                result.error500("结束时间不能为空");
+                return result;
+            }
+            Date startDate = DateUtils.parseDate(DateUtils.formatDate(startTime, "yyyy-MM-dd") + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+            Date endDate = DateUtils.parseDate(DateUtils.formatDate(endTime, "yyyy-MM-dd") + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+            List<AlarmHistory> alarmHistory = this.baseMapper.findAlarmHistory(databaseId, startDate, endDate);
+            result.setSuccess(true);
+            result.setResult(alarmHistory);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+        return result;
+    }
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailLogServiceImpl.java

@@ -0,0 +1,11 @@
+package org.jeecg.modules.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.base.entity.SysEmailLog;
+import org.jeecg.modules.mapper.SysEmailLogMapper;
+import org.jeecg.modules.service.ISysEmailLogService;
+import org.springframework.stereotype.Service;
+
+@Service("sysEmailLogService")
+public class SysEmailLogServiceImpl extends ServiceImpl<SysEmailLogMapper, SysEmailLog> implements ISysEmailLogService {
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java

@@ -0,0 +1,136 @@
+package org.jeecg.modules.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.DateUtils;
+import org.jeecg.common.util.SpringContextUtils;
+import org.jeecg.modules.entity.AlarmHistory;
+import org.jeecg.modules.base.entity.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 javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Service("sysEmailService")
+public class SysEmailServiceImpl extends ServiceImpl<SysEmailMapper, SysEmail> implements ISysEmailService {
+
+    @Override
+    public Result findPage(QueryRequest queryRequest, SysEmail sysEmail) {
+        Result result = new Result();
+        //声明page
+        Page<SysEmail> page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize());
+        //分页查询邮箱配置数据
+        LambdaQueryWrapper<SysEmail> queryWrapper = new LambdaQueryWrapper<>();
+        Page<SysEmail> sysEmailPage = this.baseMapper.selectPage(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(sysEmailPage);
+        return result;
+    }
+
+    @Override
+    public Result findInfo(String id) {
+        Result result = new Result();
+        //根据id查询对应的邮箱配置信息
+        LambdaQueryWrapper<SysEmail> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysEmail::getId, id);
+        SysEmail sysEmail = this.baseMapper.selectOne(queryWrapper);
+        if (Objects.isNull(sysEmail)){
+            result.error500("查询数据不存在");
+            return result;
+        }
+        result.setSuccess(true);
+        result.setResult(sysEmail);
+        return result;
+    }
+
+    @Override
+    @Transactional
+    public Result create(SysEmail sysEmail) {
+        Result result = new Result();
+        //获取request
+        HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
+        //获取当前操作人用户名
+        String username = JwtUtil.getUserNameByToken(request);
+        //声明id
+        Long id = IdWorker.getId();
+        sysEmail.setId(id.toString());
+        //创建时间
+        sysEmail.setCreateTime(LocalDate.now());
+        sysEmail.setCreateBy(username);
+        this.baseMapper.insert(sysEmail);
+        result.setSuccess(true);
+        result.success("新增成功");
+        return result;
+    }
+
+    @Override
+    @Transactional
+    public Result update(SysEmail sysEmail) {
+        Result result = new Result();
+        //获取request
+        HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
+        //获取当前操作人用户名
+        String username = JwtUtil.getUserNameByToken(request);
+        //根据id查询数据
+        LambdaQueryWrapper<SysEmail> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysEmail::getId, sysEmail.getId());
+        SysEmail email = this.baseMapper.selectOne(queryWrapper);
+        if (Objects.isNull(email)){
+            result.error500("对应数据不存在");
+            return result;
+        }
+        //创建时间
+        sysEmail.setUpdateTime(LocalDate.now());
+        sysEmail.setUpdateBy(username);
+        this.baseMapper.updateById(sysEmail);
+        result.setSuccess(true);
+        result.success("修改成功");
+        return result;
+    }
+
+    @Override
+    @Transactional
+    public Result deleteById(String id) {
+        Result result = new Result();
+        this.baseMapper.deleteById(id);
+        result.setSuccess(true);
+        result.success("删除成功");
+        return result;
+    }
+
+    @Override
+    public Result findAlarmHistory(String emailId, Date startTime, Date endTime) {
+        Result result = new Result();
+        try {
+            if (Objects.isNull(startTime)){
+                result.error500("开始时间不能为空");
+                return result;
+            }
+            if (Objects.isNull(endTime)){
+                result.error500("结束时间不能为空");
+                return result;
+            }
+            Date startDate = DateUtils.parseDate(DateUtils.formatDate(startTime, "yyyy-MM-dd") + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+            Date endDate = DateUtils.parseDate(DateUtils.formatDate(endTime, "yyyy-MM-dd") + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+            List<AlarmHistory> alarmHistory = this.baseMapper.findAlarmHistory(emailId, startDate, endDate);
+            result.setSuccess(true);
+            result.setResult(alarmHistory);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+        return result;
+    }
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java

@@ -0,0 +1,137 @@
+package org.jeecg.modules.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+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.DateUtils;
+import org.jeecg.common.util.SpringContextUtils;
+import org.jeecg.modules.entity.AlarmHistory;
+import org.jeecg.modules.entity.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 javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Service("sysServerService")
+public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer> implements ISysServerService {
+
+    @Override
+    public Result findPage(QueryRequest queryRequest, SysServer sysServer) {
+        Result result = new Result();
+        Page<SysServer> page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize());
+        LambdaQueryWrapper<SysServer> queryWrapper = new LambdaQueryWrapper<>();
+        Page<SysServer> sysServerPage = this.baseMapper.selectPage(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(sysServerPage);
+        return result;
+    }
+
+    @Override
+    public Result findInfo(String id) {
+        Result result = new Result();
+        if (StringUtils.isBlank(id)){
+            result.error500("id信息不能为空");
+        }
+        //查询对应数据详情内容
+        LambdaQueryWrapper<SysServer> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysServer::getId, id);
+        SysServer sysServer = this.baseMapper.selectOne(queryWrapper);
+        if (Objects.isNull(sysServer)){
+            result.error500("查询数据不存在");
+            return result;
+        }
+        result.setSuccess(true);
+        result.setResult(sysServer);
+        return result;
+    }
+
+    @Override
+    @Transactional
+    public Result create(SysServer sysServer) {
+        Result result = new Result();
+        //获取request
+        HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
+        //获取当前操作人用户名
+        String username = JwtUtil.getUserNameByToken(request);
+        //声明id
+        Long id = IdWorker.getId();
+        sysServer.setId(id.toString());
+        //赋值创建时间
+        sysServer.setCreateTime(LocalDate.now());
+        sysServer.setCreateBy(username);
+        this.baseMapper.insert(sysServer);
+        result.setSuccess(true);
+        result.success("新增成功");
+        return result;
+    }
+
+    @Override
+    @Transactional
+    public Result update(SysServer sysServer) {
+        Result result = new Result();
+        //获取request
+        HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
+        //获取当前操作人用户名
+        String username = JwtUtil.getUserNameByToken(request);
+        //根据id查询对应数据是否存在
+        LambdaQueryWrapper<SysServer> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysServer::getId, sysServer.getId());
+        SysServer server = this.baseMapper.selectOne(queryWrapper);
+        if (Objects.isNull(server)){
+            result.error500("当前数据不存在");
+            return result;
+        }
+        sysServer.setUpdateTime(LocalDate.now());
+        sysServer.setUpdateBy(username);
+        this.baseMapper.updateById(sysServer);
+        result.setSuccess(true);
+        result.success("修改成功");
+        return result;
+    }
+
+    @Override
+    @Transactional
+    public Result deleteById(String id) {
+        Result result = new Result();
+        this.baseMapper.deleteById(id);
+        result.setSuccess(true);
+        result.success("删除成功");
+        return result;
+    }
+
+    @Override
+    public Result findAlarmHistory(String serverId, Date startTime, Date endTime) {
+        Result result = new Result();
+        try {
+            if (Objects.isNull(startTime)){
+                result.error500("开始时间不能为空");
+                return result;
+            }
+            if (Objects.isNull(endTime)){
+                result.error500("结束时间不能为空");
+                return result;
+            }
+            Date startDate = DateUtils.parseDate(DateUtils.formatDate(startTime, "yyyy-MM-dd") + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+            Date endDate = DateUtils.parseDate(DateUtils.formatDate(endTime, "yyyy-MM-dd") + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+            List<AlarmHistory> alarmHistory = this.baseMapper.findAlarmHistory(serverId, startDate, endDate);
+            result.setSuccess(true);
+            result.setResult(alarmHistory);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+        return result;
+    }
+
+}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/vo/AlarmVo.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.vo;
+
+import lombok.Data;
+import org.jeecg.common.api.QueryRequest;
+import java.io.Serializable;
+
+@Data
+public class AlarmVo extends QueryRequest implements Serializable {
+    private String name;
+    private String type;
+    private String startDate;
+    private String endDate;
+    private Integer pageStart;
+    // 标记：根据条件查询但不进行分页
+    private String pageFlag;
+}

jeecg-module-auto-process/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>jeecg-boot-parent</artifactId>
+        <groupId>org.jeecgframework.boot</groupId>
+        <version>3.5.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>jeecg-module-auto-process</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-base-core</artifactId>
+        </dependency>
+        <!-- 引入jeecg-boot-starter-cloud依赖 -->
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-starter-cloud</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+</project>

jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java

@@ -0,0 +1,251 @@
+package org.jeecg.modules;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.constant.EmailConstant;
+import org.jeecg.common.email.EmailServiceManager;
+import org.jeecg.common.util.RedisUtil;
+import org.jeecg.modules.email.EmailParsingActuator;
+import org.jeecg.modules.emuns.SysMailEnableType;
+import org.jeecg.modules.email.EmailProperties;
+import org.jeecg.modules.properties.SpectrumPathProperties;
+import org.jeecg.modules.properties.TaskProperties;
+import org.jeecg.modules.service.ISysMailService;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 自动处理程序管理器
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class AutoProcessManager{
+
+    private final ISysMailService mailService;
+    private final TaskProperties taskProperties;
+    private final RedisUtil redisUtil;
+    private final SpectrumPathProperties spectrumPathProperties;
+
+    /**
+     * 邮件Map数据锁
+     */
+    private final Object lock = new Object();
+    /**
+     * 以邮件Id为key，邮件信息为value
+     */
+    private Map<String,EmailProperties> emailMap = new HashMap<>();
+
+    /**
+     * 以邮件id为key，以邮件执行线程为value
+     */
+    private Map<String,Thread> emailExecThreadMap = new HashMap<>();
+
+    /**
+     * 启动自动处理
+     */
+    public void start() {
+        //邮件数据监测线程
+        final MailDataMonitor mailDataMonitor = new MailDataMonitor();
+        mailDataMonitor.setName("mail-data-monitor");
+        mailDataMonitor.start();
+        //邮件服务监测线程
+        final MailServerMonitor monitorThread = new MailServerMonitor();
+        monitorThread.setName("mail-server-monitor");
+        monitorThread.start();
+        //邮件执行线程管理
+        final MailExecManager autoProcessThread = new MailExecManager();
+        autoProcessThread.setName("mail-exec-thread-manage");
+        autoProcessThread.start();
+    }
+
+    /**
+     * 自动处理线程
+     */
+    private class MailExecManager extends Thread{
+
+        @Override
+        public void run() {
+            for(;;){
+                long start = System.currentTimeMillis();
+                if(!CollectionUtils.isEmpty(emailMap)){
+                    Iterator<EmailProperties> iterator = emailMap.values().iterator();
+                    while(iterator.hasNext()){
+                        EmailProperties next = iterator.next();
+                        if(next.isDelFlag()){
+                            if(emailExecThreadMap.containsKey(next.getId())){
+                                Thread thread = emailExecThreadMap.get(next.getId());
+                                thread.interrupt();
+                                emailExecThreadMap.remove(next.getId());
+                            }
+                            iterator.remove();
+                        }
+                        if(next.isNewEmailFlag()){
+                            EmailParsingActuator emailParsingActuator = new EmailParsingActuator();
+                            emailParsingActuator.init(taskProperties,next);
+                            emailParsingActuator.setName(next.getUsername()+"-email-monitor");
+                            emailParsingActuator.start();
+                            //把邮件监测执行线程加入管理队列
+                            emailExecThreadMap.put(next.getId(),emailParsingActuator);
+                            //新邮件监测监测线程已启动则修改新邮件标记为false
+                            next.setNewEmailFlag(false);
+                        }
+                    }
+                }
+                long end = System.currentTimeMillis();
+                long sleepTime = taskProperties.getMonitoringMailDataCycle() - (end-start);
+                //如果sleepTime > 0 需要睡眠到指定时间，否则继续下次获取邮件
+                if(sleepTime > 0){
+                    try {
+                        //如果本次
+                        TimeUnit.MILLISECONDS.sleep(sleepTime);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 邮箱通信监测线程，具体功能如下：
+     * 监测邮件服务通讯是否正常，把各邮箱通信状态写入redis
+     */
+    private class MailServerMonitor extends Thread{
+
+        @Override
+        public void run() {
+            for(;;){
+                long start = System.currentTimeMillis();
+                try{
+                    if(!CollectionUtils.isEmpty(emailMap)){
+                        emailMap.values().forEach(email->{
+                            if(!email.isDelFlag()){
+                                final EmailServiceManager emailServiceManager = EmailServiceManager.getInstance();
+                                emailServiceManager.init(email);
+                                boolean testFlag = emailServiceManager.testConnectEmailServer();
+                                redisUtil.hset(EmailConstant.EMAIL_STATUS_PREFIX,email.getId(),testFlag);
+                                if(testFlag && !emailExecThreadMap.containsKey(email.getId())){
+                                    email.setNewEmailFlag(true);
+                                }
+                                if(!testFlag){
+                                    //如果邮件服务通信测试失败则添加删除标记
+                                    email.setDelFlag(true);
+                                }
+                            }
+                        });
+                    }
+                //捕获异常不处理保障线程异常不退出
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+                long end = System.currentTimeMillis();
+                long sleepTime = taskProperties.getMonitoringMailCommStatusCycle() - (end-start);
+                //如果sleepTime > 0 需要睡眠到指定时间，否则继续下次监测
+                if(sleepTime > 0){
+                    try {
+                        TimeUnit.MILLISECONDS.sleep(sleepTime);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 邮箱数据监测线程，具体功能如下：
+     * 1.监测邮件数据表是否有变化
+     *  1.1有新邮件记录并且已启用则启动新线程执行
+     *  1.2有邮件记录被删除并且此邮箱信息已有线程执行则停止执行
+     */
+    private class MailDataMonitor extends Thread{
+
+        @Override
+        public void run() {
+            for (;;){
+                long start = System.currentTimeMillis();
+                try{
+                    final List<EmailProperties> receiveMails = mailService.findReceiveMails();
+                    if(!CollectionUtils.isEmpty(receiveMails)){
+                        //如果库里已有数据原来已开启使用并且监测Map中已存在，现在关闭使用则添加删除标记
+                        //如果本次查询数据监测Map中不存在，并且已开启使用的则加入监测Map
+                        for(EmailProperties email : receiveMails){
+                            final boolean flag =  emailMap.containsKey(email.getId());
+                            if(flag && email.getEnabled().equals(SysMailEnableType.NOT_ENABLE.getMailEnableType())){
+                                EmailProperties sourceEmail = emailMap.get(email.getId());
+                                sourceEmail.setDelFlag(true);
+                            }
+                            if(!flag && email.getEnabled().equals(SysMailEnableType.ENABLE.getMailEnableType())){
+                                email.setNewEmailFlag(true);
+                                putSysEmailMap(email);
+                                log.info("{}邮箱加入监测队列",email.getEmailServerAddress());
+                            }
+                        }
+                        //如果监测Map中存在的邮箱数据，在本次查询数据中不存在说明库里已删除，则添加删除标记
+                        emailMap.forEach((emailId,sourceEmail)->{
+                            final long result = receiveMails.stream().filter(email -> emailId.equals(email.getId())).count();
+                            if (result <= 0){
+                                sourceEmail.setDelFlag(true);
+                            }
+                        });
+                    }
+                //捕获异常不处理保障线程异常不退出
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+                long end = System.currentTimeMillis();
+                long sleepTime = taskProperties.getMonitoringMailDataCycle() - (end-start);
+                //如果sleepTime > 0 需要睡眠到指定时间，否则继续下次监测
+                if(sleepTime > 0){
+                    try {
+                        TimeUnit.MILLISECONDS.sleep(sleepTime);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 新增邮箱数据
+     * @param email
+     */
+    private void putSysEmailMap(EmailProperties email){
+        synchronized (this.lock){
+            emailMap.put(email.getId(),email);
+        }
+    }
+
+    /**
+     * 删除邮箱数据
+     * @param emailId
+     */
+    private void removeSysEmailMap(String emailId){
+        synchronized (this.lock){
+            if (emailMap.containsKey(emailId)){
+                emailMap.remove(emailId);
+            }
+        }
+    }
+
+    /**
+     * 删除邮箱数据
+     * @param sysEmailIds
+     */
+    private void removeSysEmailMap(List<String> sysEmailIds){
+        synchronized (this.lock){
+            for(String sysEmailId : sysEmailIds){
+                if (emailMap.containsKey(sysEmailId)){
+                    emailMap.remove(sysEmailId);
+                }
+            }
+        }
+    }
+}

jeecg-module-auto-process/src/main/java/org/jeecg/modules/config/mybatis/CustomMetaObjectHandler.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.config.mybatis;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * 自定义实体字段填充
+ * @author 86187
+ */
+@Component
+public class CustomMetaObjectHandler implements MetaObjectHandler {
+
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        this.strictInsertFill(metaObject,"createTime", LocalDateTime.class,LocalDateTime.now());
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+
+    }
+}

jeecg-module-auto-process/src/main/java/org/jeecg/modules/email/EmailLogProperties.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.email;
+
+import lombok.Data;
+import org.jeecg.modules.base.entity.SysEmailLog;
+
+import java.util.List;
+
+/**
+ * 邮件日志属性
+ */
+@Data
+public class EmailLogProperties extends SysEmailLog {
+
+    /**
+     * 邮件附件本地存储路径
+     */
+    private List<String> filePathList;
+}

jeecg-module-auto-process/src/main/java/org/jeecg/modules/email/EmailParsingActuator.java

@@ -0,0 +1,107 @@
+package org.jeecg.modules.email;
+
+import org.jeecg.common.email.EmailServiceManager;
+import org.jeecg.common.email.emuns.MailContentType;
+import org.jeecg.modules.properties.TaskProperties;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeUtility;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 邮件解析执行器
+ */
+public class EmailParsingActuator extends Thread{
+
+    private TaskProperties taskProperties;
+    private EmailProperties emailProperties;
+    private ThreadPoolExecutor poolExecutor;
+
+    public void init(TaskProperties taskProperties,
+                     EmailProperties emailProperties){
+        this.taskProperties = taskProperties;
+        this.emailProperties = emailProperties;
+        //初始化线程池
+        ThreadFactory threadFactory = new CustomizableThreadFactory("mail-parsing-");
+        ThreadPoolExecutor poolExecutor = new ThreadPoolExecutor(taskProperties.getReceiveNum(),taskProperties.getReceiveNum()*2,5, TimeUnit.SECONDS, new LinkedBlockingQueue<>(),threadFactory);
+    }
+
+    @Override
+    public void run() {
+        for(;;){
+            long start = System.currentTimeMillis();
+            final EmailServiceManager emailServiceManager = EmailServiceManager.getInstance();
+            emailServiceManager.init(emailProperties,taskProperties.getReceiveNum(),taskProperties.getTemporaryStoragePath());
+            try {
+                final Message[] messages = emailServiceManager.receiveMail();
+                for(Message message : messages){
+                    final EmailLogProperties emailLogProperties = this.parseingMail(emailServiceManager,message);
+                    //如果邮件没有附件、获取附件都不是PHD文件、也不是IMS2.0协议的文件，需把邮件删除
+
+//                        emailServiceManager.removeMail(message);
+                }
+            }catch (MessagingException e) {
+                e.printStackTrace();
+            }catch (IOException e) {
+                e.printStackTrace();
+            }finally {
+                //关闭资源
+                emailServiceManager.close();
+            }
+            break;
+//            long end = System.currentTimeMillis();
+//            long sleepTime = taskProperties.getMailThreadExecCycle() - (end-start);
+//            //如果sleepTime > 0 需要睡眠到指定时间，否则继续下次获取邮件
+//            if(sleepTime > 0){
+//                try {
+//                    //如果本次
+//                    TimeUnit.MILLISECONDS.sleep(sleepTime);
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+//            }
+        }
+    }
+
+    /**
+     * 解析邮件
+     * @param message
+     */
+    public EmailLogProperties parseingMail(@NotNull EmailServiceManager emailServiceManager,@NotNull Message message) throws MessagingException, IOException {
+        //如果是带有附件的邮件
+        if(message.getContentType().startsWith(MailContentType.MIXED.getContentType())){
+            //封装邮件日志信息
+            EmailLogProperties mailLog = new EmailLogProperties();
+            mailLog.setEmailId(emailProperties.getId());
+            mailLog.setSubject(MimeUtility.decodeText(message.getSubject()));
+            final StringBuilder content = new StringBuilder();
+            emailServiceManager.getMailContent(message,content);
+            mailLog.setContext(content.toString());
+            mailLog.setReceiveTime(message.getSentDate());
+            final List<String> filePathList = emailServiceManager.saveAttachment(message);
+            mailLog.setFilePathList(filePathList);
+            return mailLog;
+        }else{
+            //如果此邮件不带有附件，则删除
+            emailServiceManager.removeMail(message);
+        }
+        return null;
+    }
+
+    //Sauna：β，Spalax：γ
+    private boolean checkMail(String filePath){
+        File file = new File(filePath);
+        if(file.isFile()){
+
+        }
+        return true;
+    }
+}

jeecg-module-auto-process/src/main/java/org/jeecg/modules/email/EmailProperties.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.email;
+
+import lombok.Data;
+import org.jeecg.modules.base.entity.SysEmail;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.io.Serializable;
+
+/**
+ * 邮件属性
+ * @author 86187
+ */
+@Data
+public class EmailProperties extends SysEmail {
+
+    /**
+     * 是否是新邮件
+     */
+    private boolean newEmailFlag;
+
+    /**
+     * 该邮件处理线程是否需要删除
+     */
+    private boolean delFlag;
+
+}

jeecg-module-auto-process/src/main/java/org/jeecg/modules/emuns/SysMailEnableType.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.emuns;
+
+/**
+ * 邮件类型
+ */
+public enum SysMailEnableType {
+
+    /**
+     * 未启用邮件
+     */
+    NOT_ENABLE(0),
+    /**
+     * 启用邮件
+     */
+    ENABLE(1);
+
+    private Integer mailEnableType;
+
+    SysMailEnableType(int mailEnableType) {
+        this.mailEnableType = mailEnableType;
+    }
+
+    public Integer getMailEnableType(){
+        return this.mailEnableType;
+    }
+}

jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/SysMailMapper.java

@@ -0,0 +1,10 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.base.entity.SysEmail;
+
+/**
+ * 邮件数据表Mapper
+ */
+public interface SysMailMapper extends BaseMapper<SysEmail> {
+}

jeecg-module-auto-process/src/main/java/org/jeecg/modules/properties/SpectrumPathProperties.java

@@ -0,0 +1,28 @@
+package org.jeecg.modules.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * 能谱文件存储路径属性
+ * @author 86187
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "file-system")
+public class SpectrumPathProperties implements Serializable {
+
+    /**
+     * 能谱文件存储根路径
+     */
+    private String rootPath;
+
+    /**
+     * 能谱文件存储路径以能谱系统类型/能谱类型为key，以存储路径为value
+     */
+    private Map<String,String> filePathMap;
+}

jeecg-module-auto-process/src/main/java/org/jeecg/modules/properties/TaskProperties.java

@@ -0,0 +1,42 @@
+package org.jeecg.modules.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.io.Serializable;
+
+/**
+ * 邮件任务运行参数
+ * @author 86187
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "task")
+public class TaskProperties implements Serializable {
+
+    /**
+     * 单次获取邮件数量
+     */
+    private Integer receiveNum;
+
+     /**
+     * 监测数据库邮箱数据变化周期
+     */
+    private Long monitoringMailDataCycle;
+
+    /**
+     * 监测邮箱通信状态周期
+     */
+    private Long monitoringMailCommStatusCycle;
+
+    /**
+     * 获取邮箱邮件线程执行周期
+     */
+    private Long mailThreadExecCycle;
+
+    /**
+     * 邮件附件临时存储路径
+     */
+    private String temporaryStoragePath;
+}

jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/ISysMailService.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.base.entity.SysEmail;
+import org.jeecg.modules.email.EmailProperties;
+import java.util.List;
+
+/**
+ * 邮箱数据服务
+ */
+public interface ISysMailService extends IService<SysEmail> {
+
+   /**
+    * 查询接收邮箱数据
+    * @return
+    */
+   List<EmailProperties> findReceiveMails();
+}

jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/SysMailServiceImpl.java

@@ -0,0 +1,47 @@
+package org.jeecg.modules.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import org.jeecg.common.email.emuns.SysMailType;
+import org.jeecg.modules.base.entity.SysEmail;
+import org.jeecg.modules.email.EmailProperties;
+import org.jeecg.modules.emuns.SysMailEnableType;
+import org.jeecg.modules.mapper.SysMailMapper;
+import org.jeecg.modules.service.ISysMailService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 邮箱数据服务实现
+ */
+@Service
+@DS("master")
+public class SysMailServiceImpl extends ServiceImpl<SysMailMapper, SysEmail> implements ISysMailService {
+
+    /**
+     * 查询接收邮箱数据
+     * @return
+     */
+    @Override
+    public List<EmailProperties> findReceiveMails() {
+        LambdaQueryWrapper<SysEmail> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysEmail::getEmilType, SysMailType.RECEIVE_EMAIL.getEmailType());
+        queryWrapper.eq(SysEmail::getEnabled, SysMailEnableType.ENABLE.getMailEnableType());
+        List<SysEmail> sysEmail = this.list(queryWrapper);
+        if(!CollectionUtils.isEmpty(sysEmail)){
+            List<EmailProperties> emailPropertiesList = Lists.newArrayList();
+            for (SysEmail email : sysEmail){
+                EmailProperties mailProperties = new EmailProperties();
+                BeanUtils.copyProperties(email,mailProperties);
+                emailPropertiesList.add(mailProperties);
+            }
+            return emailPropertiesList;
+        }
+        return Collections.emptyList();
+    }
+}

jeecg-module-log-manage/pom.xml

@@ -16,11 +16,11 @@
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jeecg-boot-base-core</artifactId>
         </dependency>
-        <!--ftp依赖-->
+
+        <!-- 引入jeecg-boot-starter-cloud依赖 -->
         <dependency>
-            <groupId>commons-net</groupId>
-            <artifactId>commons-net</artifactId>
-            <version>3.3</version>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-starter-cloud</artifactId>
         </dependency>
     </dependencies>
 

jeecg-module-log-manage/src/main/java/org/jeecg/common/util/FTPUtil.java

@@ -1,139 +0,0 @@
-package org.jeecg.common.util;
-
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.net.ftp.FTPClient;
-import org.apache.commons.net.ftp.FTPFile;
-import org.apache.commons.net.ftp.FTPReply;
-import org.jeecg.modules.entity.LogManage;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-@Component
-@Slf4j
-public class FTPUtil {
-
-    @Value("${ftp.host}")
-    private String host;
-
-    @Value("${ftp.port}")
-    private Integer port;
-
-    @Value("${ftp.userName}")
-    private String userName;
-
-    @Value("${ftp.password}")
-    private String password;
-
-    @Value("${ftp.encoding}")
-    private String encoding;
-
-    /**
-     *  登录ftp
-     * @return
-     */
-    public FTPClient LoginFTP(){
-        //声明FTP客户端
-        FTPClient ftp = new FTPClient();
-        try {
-            // 切换为本地被动模式，可以解决FTP上传后文件为空的问题，但需要服务器将FTP服务添加至防火墙白名单
-            ftp.enterLocalPassiveMode();
-            //连接
-            ftp.connect(host, port);
-            //登录
-            ftp.login(userName, password);
-            //判断是否连接成功
-            int reply = ftp.getReplyCode();
-            if (!FTPReply.isPositiveCompletion(reply)) {
-                ftp.disconnect();
-                return null;
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        return ftp;
-    }
-
-    /**
-     *  遍历查询当前路径下的文件夹信息
-     * @param ftp
-     * @param list
-     * @param filePath 以"/"开始和结束
-     * @return
-     */
-    public List<LogManage> findDirectory(FTPClient ftp,List<LogManage> list,Integer parentNum,String filePath){
-        try {
-            if (filePath.indexOf("/")>0){
-                List<String> paths = Arrays.asList(filePath.split("/"));
-                for (String path:paths) {
-                    ftp.changeWorkingDirectory(path);
-                }
-            }
-            List<FTPFile> ftpFiles = Arrays.asList(ftp.listDirectories());
-            if (CollectionUtils.isNotEmpty(ftpFiles)){
-                int num =1;
-                for (FTPFile file : ftpFiles) {
-                    if (file.isDirectory()) {
-                        LogManage logManage = new LogManage();
-                        logManage.setName(file.getName());
-                        logManage.setOrderNum(num);
-                        logManage.setParentNum(parentNum);
-                        logManage.setPath(filePath +"/"+ file.getName());
-                        list.add(logManage);
-                        num++;
-                        // 需要加此判断。否则，ftp默认将‘项目文件所在目录之下的目录（./）’与‘项目文件所在目录向上一级目录下的目录（../）’都纳入递归，这样下去就陷入一个死循环了。需将其过滤掉。
-                        if (!".".equals(file.getName()) && !"..".equals(file.getName())) {
-                            findDirectory(ftp,list,num,filePath +"/"+ file.getName());
-                            ftp.changeToParentDirectory();
-                        }
-                    }
-                }
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        return list;
-    }
-
-    public InputStream downloadFTPFile(String localPath, String fileName){
-        InputStream in = null;
-        //传输模式
-        try {
-            FTPClient ftpClient = this.LoginFTP();
-            if (Objects.isNull(ftpClient)){
-                throw new RuntimeException("ftp连接失败!");
-            }
-            List<String> paths = Arrays.asList(localPath.split("/"));
-            if (CollectionUtils.isNotEmpty(paths)){
-                for (String workPath:paths) {
-                    //切换工作文件路径
-                    ftpClient.changeWorkingDirectory(workPath);
-                }
-            }
-            ftpClient.enterLocalPassiveMode();
-            ftpClient.setFileType(FTPClient.BINARY_FILE_TYPE);
-            // 设置编码，当文件中存在中文且上传后文件乱码时可使用此配置项
-            ftpClient.setControlEncoding(encoding);
-            ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE);
-            List<FTPFile> ftpFiles = Arrays.asList(ftpClient.listFiles());
-            if (CollectionUtils.isNotEmpty(ftpFiles)){
-                for (FTPFile ftpFile:ftpFiles) {
-                    if (ftpFile.getName().equals(fileName)){
-                        in = ftpClient.retrieveFileStream(new String(fileName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1));
-                    }
-                }
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        return in;
-    }
-
-}

jeecg-module-log-manage/src/main/java/org/jeecg/modules/controller/LogManageController.java

@@ -9,6 +9,7 @@ import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.FTPUtil;
 import org.jeecg.modules.entity.FileInfo;
 import org.jeecg.modules.entity.LogManage;
+import org.jeecg.modules.service.ILogManageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,78 +29,13 @@ public class LogManageController {
 
     @Autowired
     private FTPUtil ftpUtil;
+    @Autowired
+    private ILogManageService logManageService;
 
     @GetMapping("findFtpFolders")
     @ApiOperation(value = "查询日志文件夹树形结构", notes = "查询日志文件夹树形结构")
     public List<LogManage> findFtpFolders(String workPath){
-        List<LogManage> result = new ArrayList<>();
-        try {
-            FTPClient ftpClient = ftpUtil.LoginFTP();
-            if(Objects.isNull(ftpClient)){
-                throw new RuntimeException("ftp连接失败!");
-            }
-            //切换工作文件路径
-            ftpClient.changeWorkingDirectory(workPath);
-            ftpClient.enterLocalPassiveMode();
-            List<FTPFile> ftpFiles = Arrays.asList(ftpClient.listDirectories());
-            if (CollectionUtils.isNotEmpty(ftpFiles)){
-                int num =1;
-                for (FTPFile ftpFile:ftpFiles) {
-                    LogManage logManage = new LogManage();
-                    logManage.setName(ftpFile.getName());
-                    logManage.setOrderNum(num);
-                    logManage.setParentNum(0);
-                    logManage.setPath(workPath + "/" + ftpFile.getName());
-                    result.add(logManage);
-                    num++;
-                }
-            }
-            if (CollectionUtils.isNotEmpty(result)){
-                List<LogManage> list = new LinkedList<>();
-                for (LogManage logManage:result) {
-                    list = ftpUtil.findDirectory(ftpClient, list, logManage.getOrderNum(), workPath + "/" + logManage.getName());
-                    ftpClient.changeToParentDirectory();
-                }
-                result.addAll(list);
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        result = this.LogManageTree(result);
-        return result;
-    }
-
-    /**
-     *  将当前的文件夹转换成树形结构
-     * @param logManages
-     * @return
-     */
-    public List<LogManage> LogManageTree(List<LogManage> logManages){
-        if (logManages == null) {
-            return null;
-        }
-        List<LogManage> result = new LinkedList<>();
-        Integer TOP_NODE_ID = 0;
-        logManages.forEach(logManage -> {
-            Integer pid = logManage.getParentNum();
-            if (pid == null || TOP_NODE_ID.equals(pid)) {
-                result.add(logManage);
-                return;
-            }
-            for (LogManage manage : logManages) {
-                Integer id = manage.getOrderNum();
-                if (id != null && id.equals(pid)) {
-                    if (manage.getChildren() == null) {
-                        manage.initChildren();
-                    }
-                    logManage.setHashParent(true);
-                    manage.getChildren().add(logManage);
-                    manage.setHashChild(true);
-                    return;
-                }
-            }
-        });
-        return result;
+        return logManageService.findFtpFolders(workPath);
     }
 
     /**
@@ -110,71 +46,16 @@ public class LogManageController {
     @GetMapping("findFiles")
     @ApiOperation(value = "查询目录下文件内容", notes = "查询目录下文件内容")
     public List<FileInfo> findFiles(String path){
-        List<FileInfo> result = new ArrayList<>();
-        try {
-            FTPClient ftpClient = ftpUtil.LoginFTP();
-            if (Objects.isNull(ftpClient)){
-                throw new RuntimeException("ftp连接失败!");
-            }
-            List<String> paths = Arrays.asList(path.split("/"));
-            if (CollectionUtils.isNotEmpty(paths)){
-                for (String workPath:paths) {
-                    //切换工作文件路径
-                    ftpClient.changeWorkingDirectory(workPath);
-                }
-            }
-            ftpClient.enterLocalPassiveMode();
-            List<FTPFile> ftpFiles = Arrays.asList(ftpClient.listFiles());
-            if (CollectionUtils.isNotEmpty(ftpFiles)){
-                for (FTPFile ftpFile:ftpFiles) {
-                    if (ftpFile.isFile()){
-                        FileInfo fileInfo = new FileInfo();
-                        fileInfo.setFileName(ftpFile.getName());
-                        fileInfo.setFilePath(path +"/"+ ftpFile.getName());
-                        fileInfo.setFileSize(String.format("%.2f", Double.valueOf(Double.valueOf(ftpFile.getSize())/1024)) + "KB");
-                        fileInfo.setFileDate(DateUtils.formatDate(ftpFile.getTimestamp(),"yyyy-MM-dd"));
-                        result.add(fileInfo);
-                    }
-                }
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        return result;
+        return logManageService.findFiles(path);
     }
 
     @PostMapping("downloadFile")
     @ApiOperation(value = "ftp文件下载", notes = "ftp文件下载")
-    public void downloadFile(String localPath, String fileName, HttpServletResponse response) throws IOException {
+    public void downloadFile(String localPath, String fileName, HttpServletResponse response) {
         if (localPath.contains(fileName)){
             localPath=localPath.substring(0,localPath.indexOf(fileName)-1);
         }
-        //重置响应信息
-        response.reset();
-        //设置响应类型
-        response.setContentType("application/download");
-        //解决中文不能生成文件
-        response.setHeader("Content-Disposition", "attachment; fileName=" + URLEncoder.encode(fileName,"UTF-8"));
-        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
-        //获取文件的输入流
-        InputStream in = ftpUtil.downloadFTPFile(localPath, fileName);
-        //获取输出流
-        ServletOutputStream out = response.getOutputStream();
-        //声明一个长度参数
-        int len;
-        //声明字节数组
-        byte[] bytes = new byte[1024];
-        //判断如果输入流的字节长度不等于-1，进行字节数组内容的读取
-        while ((len = in.read(bytes)) != -1) {
-            out.write(bytes, 0, len);
-        }
-        out.flush();
-        if (out != null) {
-            out.close();
-        }
-        if (in != null) {
-            in.close();
-        }
+        ftpUtil.downloadFTPFile(localPath, fileName,response);
     }
 
 }

jeecg-module-log-manage/src/main/java/org/jeecg/modules/entity/FileInfo.java

@@ -5,12 +5,24 @@ import lombok.Data;
 @Data
 public class FileInfo {
 
+    /**
+     *  文件名称
+     */
     private String fileName;
 
+    /**
+     *  文件路径
+     */
     private String filePath;
 
+    /**
+     *  文件大小
+     */
     private String fileSize;
 
+    /**
+     *  文件日期
+     */
     private String fileDate;
 
 }

jeecg-module-log-manage/src/main/java/org/jeecg/modules/entity/LogManage.java

@@ -8,18 +8,39 @@ import java.util.List;
 @Data
 public class LogManage {
 
+    /**
+     *  名称
+     */
     private String name;
 
+    /**
+     *  路径
+     */
     private String path;
 
+    /**
+     *  排序编号
+     */
     private Integer orderNum;
 
+    /**
+     *  父级编号
+     */
     private Integer parentNum;
 
+    /**
+     *  是否有父级
+     */
     private boolean hashParent;
 
+    /**
+     *  是否有子级
+     */
     private boolean hashChild;
 
+    /**
+     *  子级数组
+     */
     private List<LogManage> children;
 
     public void initChildren(){

jeecg-module-log-manage/src/main/java/org/jeecg/modules/service/ILogManageService.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.service;
+
+import org.jeecg.modules.entity.FileInfo;
+import org.jeecg.modules.entity.LogManage;
+
+import java.util.List;
+
+public interface ILogManageService {
+
+    /**
+     *  查询日志文件夹树形结构
+     * @param workPath
+     * @return
+     */
+    List<LogManage> findFtpFolders(String workPath);
+
+    /**
+     *  查询目录下文件内容
+     * @param path
+     * @return
+     */
+    List<FileInfo> findFiles(String path);
+
+}

jeecg-module-log-manage/src/main/java/org/jeecg/modules/service/impl/LogManageServiceImpl.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPFile;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.common.util.FTPUtil;
+import org.jeecg.modules.entity.FileInfo;
+import org.jeecg.modules.entity.LogManage;
+import org.jeecg.modules.service.ILogManageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.util.*;
+
+@Service("logManageService")
+public class LogManageServiceImpl implements ILogManageService {
+
+    @Autowired
+    private FTPUtil ftpUtil;
+
+    @Override
+    public List<LogManage> findFtpFolders(String workPath) {
+        List<LogManage> result = new ArrayList<>();
+        try {
+            FTPClient ftpClient = ftpUtil.LoginFTP();
+            if(Objects.isNull(ftpClient)){
+                throw new RuntimeException("ftp连接失败!");
+            }
+            //切换工作文件路径
+            ftpClient.changeWorkingDirectory(workPath);
+            ftpClient.enterLocalPassiveMode();
+            List<FTPFile> ftpFiles = Arrays.asList(ftpClient.listDirectories());
+            if (CollectionUtils.isNotEmpty(ftpFiles)){
+                int num =1;
+                for (FTPFile ftpFile:ftpFiles) {
+                    LogManage logManage = new LogManage();
+                    logManage.setName(ftpFile.getName());
+                    logManage.setOrderNum(num);
+                    logManage.setParentNum(0);
+                    logManage.setPath(workPath + "/" + ftpFile.getName());
+                    result.add(logManage);
+                    num++;
+                }
+            }
+            if (CollectionUtils.isNotEmpty(result)){
+                List<LogManage> list = new LinkedList<>();
+                for (LogManage logManage:result) {
+                    list = this.findDirectory(ftpClient, list, logManage.getOrderNum(), workPath + "/" + logManage.getName());
+                    ftpClient.changeToParentDirectory();
+                }
+                result.addAll(list);
+            }
+            if (ftpClient != null){
+                ftpClient.disconnect();
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        result = this.LogManageTree(result);
+        return result;
+    }
+
+    @Override
+    public List<FileInfo> findFiles(String path) {
+        List<FileInfo> result = new ArrayList<>();
+        try {
+            FTPClient ftpClient = ftpUtil.LoginFTP();
+            if (Objects.isNull(ftpClient)){
+                throw new RuntimeException("ftp连接失败!");
+            }
+            List<String> paths = Arrays.asList(path.split("/"));
+            if (CollectionUtils.isNotEmpty(paths)){
+                for (String workPath:paths) {
+                    //切换工作文件路径
+                    ftpClient.changeWorkingDirectory(workPath);
+                }
+            }
+            ftpClient.enterLocalPassiveMode();
+            List<FTPFile> ftpFiles = Arrays.asList(ftpClient.listFiles());
+            if (CollectionUtils.isNotEmpty(ftpFiles)){
+                for (FTPFile ftpFile:ftpFiles) {
+                    if (ftpFile.isFile()){
+                        FileInfo fileInfo = new FileInfo();
+                        fileInfo.setFileName(ftpFile.getName());
+                        fileInfo.setFilePath(path +"/"+ ftpFile.getName());
+                        fileInfo.setFileSize(String.format("%.2f", Double.valueOf(Double.valueOf(ftpFile.getSize())/1024)) + "KB");
+                        fileInfo.setFileDate(DateUtils.formatDate(ftpFile.getTimestamp(),"yyyy-MM-dd"));
+                        result.add(fileInfo);
+                    }
+                }
+            }
+            if (ftpClient != null){
+                ftpClient.disconnect();
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return result;
+    }
+
+    /**
+     *  遍历查询当前路径下的文件夹信息
+     * @param ftp
+     * @param list
+     * @param filePath 以"/"开始和结束
+     * @return
+     */
+    public List<LogManage> findDirectory(FTPClient ftp,List<LogManage> list,Integer parentNum,String filePath){
+        try {
+            if (filePath.indexOf("/")>0){
+                List<String> paths = Arrays.asList(filePath.split("/"));
+                for (String path:paths) {
+                    ftp.changeWorkingDirectory(path);
+                }
+            }
+            List<FTPFile> ftpFiles = Arrays.asList(ftp.listDirectories());
+            if (CollectionUtils.isNotEmpty(ftpFiles)){
+                int num =1;
+                for (FTPFile file : ftpFiles) {
+                    if (file.isDirectory()) {
+                        LogManage logManage = new LogManage();
+                        logManage.setName(file.getName());
+                        logManage.setOrderNum(num);
+                        logManage.setParentNum(parentNum);
+                        logManage.setPath(filePath +"/"+ file.getName());
+                        list.add(logManage);
+                        num++;
+                        // 需要加此判断。否则，ftp默认将‘项目文件所在目录之下的目录（./）’与‘项目文件所在目录向上一级目录下的目录（../）’都纳入递归，这样下去就陷入一个死循环了。需将其过滤掉。
+                        if (!".".equals(file.getName()) && !"..".equals(file.getName())) {
+                            findDirectory(ftp,list,num,filePath +"/"+ file.getName());
+                            ftp.changeToParentDirectory();
+                        }
+                    }
+                }
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return list;
+    }
+
+    /**
+     *  将当前的文件夹转换成树形结构
+     * @param logManages
+     * @return
+     */
+    public List<LogManage> LogManageTree(List<LogManage> logManages){
+        if (logManages == null) {
+            return null;
+        }
+        List<LogManage> result = new LinkedList<>();
+        Integer TOP_NODE_ID = 0;
+        logManages.forEach(logManage -> {
+            Integer pid = logManage.getParentNum();
+            if (pid == null || TOP_NODE_ID.equals(pid)) {
+                result.add(logManage);
+                return;
+            }
+            for (LogManage manage : logManages) {
+                Integer id = manage.getOrderNum();
+                if (id != null && id.equals(pid)) {
+                    if (manage.getChildren() == null) {
+                        manage.initChildren();
+                    }
+                    logManage.setHashParent(true);
+                    manage.getChildren().add(logManage);
+                    manage.setHashChild(true);
+                    return;
+                }
+            }
+        });
+        return result;
+    }
+
+}

jeecg-module-station-operation/pom.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.jeecgframework.boot</groupId>
+        <artifactId>jeecg-boot-parent</artifactId>
+        <version>3.5.1</version>
+    </parent>
+
+    <artifactId>jeecg-module-station-operation</artifactId>
+
+    <dependencies>
+        <!-- 引入jeecg-boot-starter-cloud依赖 -->
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-starter-cloud</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-base-core</artifactId>
+        </dependency>
+
+        <!-- 用于存储计算经纬度 -->
+        <dependency>
+            <groupId>com.spatial4j</groupId>
+            <artifactId>spatial4j</artifactId>
+            <version>0.5</version>
+        </dependency>
+    </dependencies>
+
+</project>

jeecg-module-station-operation/src/main/java/org/jeecg/common/CacheName.java

@@ -0,0 +1,15 @@
+package org.jeecg.common;
+
+import org.springframework.stereotype.Component;
+
+public class CacheName {
+
+    public static final String cacheTime = "Cache time";
+
+    public static final String scaleInterval = "Scale interval";
+
+    public static final String timelineLength  = "Timeline length";
+
+    public static final String updateIntervalTime = "Update interval time";
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/common/PointUtil.java

@@ -0,0 +1,39 @@
+package org.jeecg.common;
+
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+
+import java.util.Objects;
+
+public class PointUtil {
+
+    public static String calculate(String pointValue){
+        Double Degrees = 0.0;
+        Double minutes = 0.0;
+        Double seconds = 0.0;
+        if (pointValue.indexOf("°")>0  || pointValue.indexOf("′")>0 || pointValue.indexOf("″")>0){
+            if (pointValue.indexOf("°")>0){
+                Degrees = Double.valueOf(pointValue.substring(0, pointValue.indexOf("°")));
+                pointValue = pointValue.substring(pointValue.indexOf("°")+1);
+            }
+            if (pointValue.indexOf("′")>0){
+                minutes = Double.valueOf(pointValue.substring(0, pointValue.indexOf("′")));
+                pointValue = pointValue.substring(pointValue.indexOf("′")+1);
+            }
+            if (pointValue.indexOf("″")>0){
+                seconds = Double.valueOf(pointValue.substring(0, pointValue.indexOf("″")));
+            }
+            if (Objects.nonNull(Degrees) || Objects.nonNull(minutes) || Objects.nonNull(seconds)){
+                Double result = Degrees + minutes/60+seconds/3600;
+                if (pointValue.indexOf("W")>0 || pointValue.indexOf("S")>0){
+                    result = -1 * result;
+                }
+                pointValue = String.valueOf(result);
+            }
+        }
+        return pointValue;
+    }
+
+
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/common/StationTypeUtil.java

@@ -0,0 +1,36 @@
+package org.jeecg.common;
+
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.modules.entity.StationType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Component
+public class StationTypeUtil {
+
+    @Autowired
+    private StationType stationType;
+
+    public List<String> findAllStationType(){
+        List<StationType> stationTypeList = stationType.getTypes();
+        List<String> stationTypes = stationTypeList.stream().map(StationType::getName).collect(Collectors.toList());
+        return stationTypes;
+    }
+
+    public String getStationType(Integer stationId){
+        String type = "";
+        List<StationType> stationTypeList = stationType.getTypes();
+        for (StationType stationType:stationTypeList) {
+            if (StringUtils.isNotBlank(stationType.getMinId()) && StringUtils.isNotBlank(stationType.getMaxId())){
+                if (stationId>Integer.valueOf(stationType.getMinId()) && stationId<=Integer.valueOf(stationType.getMaxId())){
+                    type = stationType.getName();
+                }
+            }
+        }
+        return type;
+    }
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/StationOperationController.java

@@ -0,0 +1,68 @@
+package org.jeecg.modules.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.entity.Point;
+import org.jeecg.modules.entity.PointVo;
+import org.jeecg.modules.entity.StationOperation;
+import org.jeecg.modules.service.IStationOperationService;
+import org.jeecg.modules.system.entity.GardsNuclearfacility;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequestMapping("stationOperation")
+@Api(value = "台站运行管理", tags = "台站运行管理")
+public class StationOperationController {
+
+    @Autowired
+    private IStationOperationService stationOperationService;
+
+    @GetMapping("findStationType")
+    @ApiOperation(value = "查询台站，核设施类型", notes = "查询台站，核设施类型")
+    public List<String> findStationType(){
+        List<String> result = stationOperationService.findStationType();
+        return result;
+    }
+
+    @GetMapping("findList")
+    @ApiOperation(value = "查询所有台站，核设施信息", notes = "查询所有台站，核设施信息")
+    public List<StationOperation> findList(String status, String stationType){
+        List<StationOperation> result = stationOperationService.findList(status, stationType);
+        return result;
+    }
+
+    @GetMapping("findInfo")
+    @ApiOperation(value = "查询台站/核设施详情信息", notes = "查询台站/核设施详情信息")
+    public Result findInfo(String stationId, String type){
+        Result result = stationOperationService.findInfo(stationId, type);
+        return result;
+    }
+
+    @GetMapping("findTree")
+    @ApiOperation(value = "查询台站树形结构", notes = "查询台站树形结构")
+    public Result findTree(){
+        Result result = stationOperationService.findTree();
+        return result;
+    }
+
+    @PostMapping("getHitEquList")
+    @ApiOperation(value = "查询半径内核设施信息", notes = "查询半径内核设施信息")
+    public Result getHitEquList(@RequestBody PointVo pointVo){
+        Result result = stationOperationService.getHitEquList(pointVo);
+        return result;
+    }
+
+    @GetMapping("getDataReceivingStatus")
+    @ApiOperation(value = "查询台站监测数据信息", notes = "查询台站监测数据信息")
+    public Result getDataReceivingStatus(String userId){
+        return stationOperationService.getDataReceivingStatus(userId);
+    }
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/SysUserFocusStationController.java

@@ -0,0 +1,51 @@
+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.config.valid.InsertGroup;
+import org.jeecg.modules.entity.SysUserFocusStation;
+import org.jeecg.modules.entity.UserFocusStation;
+import org.jeecg.modules.service.ISysUserFocusStationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("sysUserFocusStation")
+@Api(value = "关注台站管理", tags = "关注台站管理")
+public class SysUserFocusStationController {
+
+    @Autowired
+    private ISysUserFocusStationService sysUserFocusStationService;
+
+    @GetMapping("findList")
+    @ApiOperation(value = "查询关注台站列表", notes = "查询关注台站列表")
+    public List<SysUserFocusStation> findList(){
+        List<SysUserFocusStation> result = sysUserFocusStationService.findList();
+        return result;
+    }
+
+    @PostMapping("saveUserFocusByUserId")
+    @ApiOperation(value = "保存用户关注台站及缓存配置信息", notes = "保存用户关注台站及缓存配置信息")
+    public Result create(@RequestBody UserFocusStation userFocusStation){
+        return sysUserFocusStationService.create(userFocusStation);
+    }
+
+    @DeleteMapping("deleteById")
+    @ApiOperation(value = "取消关注", notes = "取消关注")
+    public Result deleteById(String stationId){
+        return sysUserFocusStationService.deleteById(stationId);
+    }
+
+    @GetMapping("findUserFocusByUserId")
+    @ApiOperation(value = "根据用户id查询用户的缓存配置信息及关注台站信息", notes = "根据用户id查询用户的缓存配置信息及关注台站信息")
+    public Result findUserFocusByUserId(String userId){
+        return sysUserFocusStationService.findUserFocusByUserId(userId);
+    }
+
+
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/DataInfoVo.java

@@ -0,0 +1,43 @@
+package org.jeecg.modules.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class DataInfoVo implements Serializable {
+
+    /**
+     *  类型
+     */
+    private String type;
+
+    /**
+     *  状态
+     */
+    private String status;
+
+    /**
+     *  开始时间
+     */
+    private Double beginTime;
+
+    /**
+     *  结束时间
+     */
+    private Double endTime;
+
+    /**
+     *  时间间隔
+     */
+    private Double spanTime;
+
+    /**
+     *  比率
+     */
+    private Double rate;
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/DetectorData.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class DetectorData implements Serializable {
+
+    /**
+     *  探测器id
+     */
+    private Integer detectorId;
+
+    /**
+     *  探测器编码
+     */
+    private String detectorCode;
+
+    /**
+     *  数据集合
+     */
+    private List<DataInfoVo> dataList;
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/Point.java

@@ -0,0 +1,40 @@
+package org.jeecg.modules.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class Point implements Serializable {
+
+    /**
+     *  台站名称
+     */
+    private String stationName;
+
+    /**
+     *  核设施名称
+     */
+    private String nuclearFacilityName;
+
+    /**
+     *  经度
+     */
+    private String lon;
+
+    /**
+     *  纬度
+     */
+    private String lat;
+
+    /**
+     *  半径
+     */
+    private String radius;
+
+    /**
+     *  核设施id
+     */
+    private String nuclearFacilityId;
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/PointVo.java

@@ -0,0 +1,20 @@
+package org.jeecg.modules.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PointVo {
+
+    /**
+     *  台站id集合
+     */
+    private List<String> stationIds;
+
+    /**
+     *  半径
+     */
+    private Double radius;
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationData.java

@@ -0,0 +1,28 @@
+package org.jeecg.modules.entity;
+
+import lombok.Data;
+import org.jeecg.modules.system.entity.GardsDetectors;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class StationData implements Serializable {
+
+    /**
+     *  台站id
+     */
+    private String stationId;
+
+    /**
+     *  台站编码
+     */
+    private String stationCode;
+
+    /**
+     *  探测器数据集合
+     */
+    private Map<String, List<Map<String, DetectorData>>> detectors;
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationOperation.java

@@ -0,0 +1,50 @@
+package org.jeecg.modules.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class StationOperation implements Serializable {
+
+    /**
+     *  台站/核设施id
+     */
+    private Integer stationId;
+
+    /**
+     *  台站/核设施名称
+     */
+    private String stationName;
+
+    /**
+     *  台站/核设施类型
+     */
+    private String stationType;
+
+    /**
+     *  海拔
+     */
+    private String altitude;
+
+    /**
+     *  经度
+     */
+    private String lon;
+
+    /**
+     *  纬度
+     */
+    private String lat;
+
+    /**
+     *  状态
+     */
+    private String status;
+
+    /**
+     * 标记
+     */
+    private String signal;
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationReceivingConfig.java

@@ -0,0 +1,58 @@
+package org.jeecg.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@TableName(value = "station_receiving_config")
+public class StationReceivingConfig implements Serializable {
+
+    /**
+     *  id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     *  用户id
+     */
+    @TableField(value = "user_id")
+    private String userId;
+
+    /**
+     *  缓存时间
+     */
+    @TableField(value = "cache_time")
+    private Double cacheTime;
+
+    /**
+     *  间隔缩放
+     */
+    @TableField(value = "scale_interval")
+    private Double scaleInterval;
+
+    /**
+     *  时间线长度
+     */
+    @TableField(value = "timeline_length")
+    private Double timelineLength;
+
+    /**
+     *  更新间隔时间
+     */
+    @TableField(value = "update_interval_time")
+    private Double updateIntervalTime;
+
+    /**
+     *  用户关注台站信息
+     */
+    @TableField(exist = false)
+    List<SysUserFocusStation> sysUserFocusStations;
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationTree.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.entity;
+
+import lombok.Data;
+import org.jeecg.modules.system.entity.GardsStations;
+
+import java.util.List;
+
+@Data
+public class StationTree {
+
+    /**
+     *  台站id
+     */
+    private Integer stationId;
+
+    /**
+     *  编码
+     */
+    private String code;
+
+    /**
+     *  子数据集合
+     */
+    List<Object> children;
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationType.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.entity;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "station")
+public class StationType implements Serializable {
+
+    private String name;
+
+    private String minId;
+
+    private String maxId;
+
+    private List<StationType> types = new ArrayList<>();
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUser.java

@@ -0,0 +1,33 @@
+package org.jeecg.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+@Data
+@TableName("sys_user")
+public class SysUser implements Serializable {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 登录账号
+     */
+    @Excel(name = "登录账号", width = 15)
+    private String username;
+
+    /**
+     * 真实姓名
+     */
+    @Excel(name = "真实姓名", width = 15)
+    private String realname;
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java

@@ -0,0 +1,95 @@
+package org.jeecg.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.jeecg.config.valid.InsertGroup;
+import org.jeecg.config.valid.UpdateGroup;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Null;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+@TableName("sys_user_focus_station")
+public class SysUserFocusStation implements Serializable {
+
+    /**
+     *  id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    @NotBlank(message = "不能为空", groups = UpdateGroup.class)
+    private String id;
+
+    /**
+     *  用户id
+     */
+    @TableField(value = "user_id")
+    private String userId;
+
+    /**
+     *  台站id
+     */
+    @TableField(value = "station_id")
+    @NotBlank(message = "不能为空", groups = {InsertGroup.class, UpdateGroup.class})
+    private String stationId;
+
+    /**
+     *  类型
+     */
+    @TableField(value = "station_type")
+    @NotBlank(message = "不能为空", groups = {InsertGroup.class, UpdateGroup.class})
+    private String stationType;
+
+    /**
+     *  创建时间
+     */
+    @TableField(value = "create_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    /**
+     *  创建人
+     */
+    @TableField(value = "create_by")
+    private String createBy;
+
+    /**
+     *  经度
+     */
+    @TableField(exist = false)
+    private Double lon;
+
+    /**
+     *  纬度
+     */
+    @TableField(exist = false)
+    private Double lat;
+
+    /**
+     *  海拔
+     */
+    @TableField(exist = false)
+    private String altitude;
+
+    /**
+     *  状态
+     */
+    @TableField(exist = false)
+    private String status;
+
+    /**
+     *  台站编码
+     */
+    @TableField(exist = false)
+    private String stationCode;
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/UserFocusStation.java

@@ -0,0 +1,36 @@
+package org.jeecg.modules.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class UserFocusStation implements Serializable {
+
+    /**
+     *  缓存时间
+     */
+    private Double cacheTime;
+
+    /**
+     *  间隔缩放
+     */
+    private Double scaleInterval;
+
+    /**
+     *  时间线长度
+     */
+    private Double timelineLength;
+
+    /**
+     *  更新间隔时间
+     */
+    private Double updateIntervalTime;
+
+    /**
+     *  台站id集合
+     */
+    private List<Integer> stationIds;
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationMetDataMapper.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.base.entity.GardsMetData;
+
+import java.util.List;
+
+@DS("ori")
+public interface StationMetDataMapper extends BaseMapper<GardsMetData> {
+
+    List<GardsMetData> findMetDataList(@Param("stationIds") List<String> stationIds, @Param("startDate") String startDate);
+
+}

jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationOperationMapper.java

@@ -0,0 +1,7 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.entity.StationOperation;
+
+public interface StationOperationMapper extends BaseMapper<StationOperation> {
+}