From 1f54fa41a712e89bd475728f46378a5de00c93b5 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Wed, 14 Jun 2023 15:47:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E7=AE=A1=E7=90=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=8E=86=E5=8F=B2=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8A=A5=E8=AD=A6=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysDatabaseController.java | 9 +++++++ .../controller/SysEmailController.java | 9 +++++++ .../modules/mapper/SysDatabaseMapper.java | 8 ++++++ .../jeecg/modules/mapper/SysEmailMapper.java | 8 ++++++ .../modules/mapper/xml/SysEmailMapper.xml | 23 ++++++++++++++++ .../modules/mapper/xml/sysDatabaseMapper.xml | 23 ++++++++++++++++ .../modules/service/ISysDatabaseService.java | 5 ++++ .../modules/service/ISysEmailService.java | 4 +++ .../service/impl/SysDatabaseServiceImpl.java | 27 +++++++++++++++++++ .../service/impl/SysEmailServiceImpl.java | 27 +++++++++++++++++++ 10 files changed, 143 insertions(+) create mode 100644 jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysEmailMapper.xml create mode 100644 jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/sysDatabaseMapper.xml diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java index 860687d7..ad50f156 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java @@ -6,8 +6,11 @@ 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 java.util.Date; + @RestController @RequestMapping("sysDatabase") @Api(value = "数据库配置管理", tags = "数据库配置管理") @@ -41,4 +44,10 @@ public class SysDatabaseController { return sysDatabaseService.deleteById(id); } + @GetMapping("findAlarmHistory") + 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); + } + } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java index 5b6733e0..3d51fea1 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java @@ -7,8 +7,11 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.modules.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 = "邮箱配置信息管理") @@ -47,4 +50,10 @@ public class SysEmailController { return sysEmailService.deleteById(id); } + @GetMapping("findAlarmHistory") + 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); + } + } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java index e58a3770..c3be5b15 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java @@ -1,7 +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 { + + List findAlarmHistory(@Param("databaseId") String databaseId, @Param("startDate") Date startDate, @Param("endDate") Date endDate); + } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java index 8ce3adf4..ed46c7d8 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java @@ -1,7 +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.SysEmail; +import java.util.Date; +import java.util.List; + public interface SysEmailMapper extends BaseMapper { + + List findAlarmHistory( @Param("emailId") String emailId, @Param("startDate") Date startDate, @Param("endDate") Date endDate); + } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysEmailMapper.xml b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysEmailMapper.xml new file mode 100644 index 00000000..5d471498 --- /dev/null +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysEmailMapper.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/sysDatabaseMapper.xml b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/sysDatabaseMapper.xml new file mode 100644 index 00000000..66c94989 --- /dev/null +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/sysDatabaseMapper.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java index 075b4b0e..f5d6ced3 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java @@ -4,6 +4,9 @@ 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 { @@ -17,4 +20,6 @@ public interface ISysDatabaseService extends IService { Result deleteById(String id); + Result findAlarmHistory(String databaseId, Date startTime, Date endTime); + } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java index bf36aca2..6e34062e 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java @@ -5,6 +5,8 @@ import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.SysEmail; +import java.util.Date; + public interface ISysEmailService extends IService { Result findPage(QueryRequest queryRequest, SysEmail sysEmail); @@ -17,4 +19,6 @@ public interface ISysEmailService extends IService { Result deleteById(String id); + Result findAlarmHistory(String emailId, Date startTime, Date endTime); + } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java index 5ac62f4c..ffd20088 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java @@ -7,7 +7,9 @@ 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; @@ -15,7 +17,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; +import java.text.ParseException; import java.util.Date; +import java.util.List; import java.util.Objects; @Service("sysDatabaseService") @@ -101,4 +105,27 @@ public class SysDatabaseServiceImpl extends ServiceImpl alarmHistory = this.baseMapper.findAlarmHistory(databaseId, startDate, endDate); + result.setSuccess(true); + result.setResult(alarmHistory); + } catch (ParseException e) { + throw new RuntimeException(e); + } + return result; + } + } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java index 672851b4..32639935 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java @@ -7,7 +7,9 @@ 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.SysEmail; import org.jeecg.modules.mapper.SysEmailMapper; import org.jeecg.modules.service.ISysEmailService; @@ -15,7 +17,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; +import java.text.ParseException; import java.util.Date; +import java.util.List; import java.util.Objects; @Service("sysEmailService") @@ -105,4 +109,27 @@ public class SysEmailServiceImpl extends ServiceImpl i 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 = this.baseMapper.findAlarmHistory(emailId, startDate, endDate); + result.setSuccess(true); + result.setResult(alarmHistory); + } catch (ParseException e) { + throw new RuntimeException(e); + } + return result; + } + }