From fa2366b8aa4e54560f5fc01f293fcf683fa1189d Mon Sep 17 00:00:00 2001 From: nieziyan Date: Fri, 16 Jun 2023 20:12:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E4=BE=9D=E8=B5=96=E8=A1=A5?= =?UTF-8?q?=E5=85=A8=20update=EF=BC=9A=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AlarmLogController.java | 8 +-- .../jeecg/modules/mapper/AlarmLogMapper.java | 4 +- .../modules/mapper/xml/AlarmLogMapper.xml | 55 +++++++------------ .../service/impl/AlarmLogServiceImpl.java | 45 ++++++++++----- .../java/org/jeecg/modules/vo/AlarmVo.java | 2 + .../system/controller/LoginController.java | 7 ++- .../jeecg-abnormal-alarm-start/pom.xml | 8 ++- .../jeecg-log-manage-start/pom.xml | 5 ++ .../jeecg-station-operation-start/pom.xml | 5 ++ .../jeecg-web-statistics-start/pom.xml | 5 ++ 10 files changed, 83 insertions(+), 61 deletions(-) diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java index a6f0f6be..16ed0341 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java @@ -16,20 +16,20 @@ public class AlarmLogController { @Autowired private IAlarmLogService alarmLogService; @ApiOperation("报警日志量总览-柱状图") - @GetMapping("viewAll") + @PostMapping("viewAll") public Result viewAll(@RequestBody AlarmVo alarmVo){ return alarmLogService.viewAll(alarmVo); } @ApiOperation("分页查询报警日志信息") - @GetMapping("findPage") + @PostMapping("findPage") public Result findPage(@RequestBody AlarmVo alarmVo){ return alarmLogService.findPage(alarmVo); } @ApiOperation("各类型报警量统计-饼图") - @GetMapping("typeAlarms") + @PostMapping("typeAlarms") public Result typeAlarms(@RequestBody AlarmVo alarmVo){ return alarmLogService.typeAlarms(alarmVo); } @ApiOperation("报警规则top5-柱状图") - @GetMapping("ruleTop") + @PostMapping("ruleTop") public Result ruleTop5(@RequestBody AlarmVo alarmVo){ return alarmLogService.ruleTop5(alarmVo); } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmLogMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmLogMapper.java index 602bd02f..4be954c9 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmLogMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmLogMapper.java @@ -13,9 +13,7 @@ import java.util.Map; public interface AlarmLogMapper extends BaseMapper { - List oneDay(Map params); - - List oneMoreDay(Map params); + List rangeDay(Map params); List findPage(Map params); List typeAlarms(Map params); diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/AlarmLogMapper.xml b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/AlarmLogMapper.xml index ceca8246..64f9b6b2 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/AlarmLogMapper.xml +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/AlarmLogMapper.xml @@ -1,6 +1,24 @@ + - - \ No newline at end of file diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmLogServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmLogServiceImpl.java index cc2719ed..d6f15fad 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmLogServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmLogServiceImpl.java @@ -1,6 +1,7 @@ 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; @@ -37,11 +38,26 @@ public class AlarmLogServiceImpl extends ServiceImpl i 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 xData = new HashSet<>(); + Collection YData = new ArrayList<>(); + Map result = new HashMap<>(); + // 转换参数 数据查询 Map params = BeanUtil.beanToMap(alarmVo); - List allDate; - /* 选择日期为同一天 按照小时划分 0-23小时 */ + List 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)){ - allDate = baseMapper.oneDay(params); Map> groupTime = allDate.stream() .sorted(Comparator.comparing(Date::getHours)) .collect(Collectors.groupingBy(Date::getHours)); @@ -55,17 +71,14 @@ public class AlarmLogServiceImpl extends ServiceImpl i } } // 返回x轴和y轴数据 - Set xData = statistic.keySet(); - Collection YData = statistic.values(); - Map result = new HashMap<>(); + xData = statistic.keySet(); + YData = statistic.values(); result.put("xData",xData); result.put("yData",YData); return Result.OK(result); } - /* 选择日期不是同一天 按照天划分(可以跨月选择,但不包括跨年) */ + /* 2.选择日期不是同一天 按照天划分(可以跨月选择,但不包括跨年) */ else { - allDate = baseMapper.oneMoreDay(params); - Map statistic = new HashMap<>(); // 通过mounth分组 Map> groupMounth = allDate.stream() @@ -102,16 +115,16 @@ public class AlarmLogServiceImpl extends ServiceImpl i return dateStr; }) .collect(Collectors.toList()); - // 将startDate和endDate中没有预警信息的day设置为0 + // startDate和endDate范围内无报警信息 + // 的日期(哪一天),将其报警数量设置为0 for (String dateStr : allDateStr) { if (!allDateStr.contains(dateStr)){ statistic.put(dateStr,0); } } // 返回x轴和y轴数据 - Set xData = statistic.keySet(); - Collection YData = statistic.values(); - Map result = new HashMap<>(); + xData = statistic.keySet(); + YData = statistic.values(); result.put("xData",xData); result.put("yData",YData); return Result.OK(result); @@ -134,8 +147,10 @@ public class AlarmLogServiceImpl extends ServiceImpl i List alarmHistories = baseMapper.findPage(params); // 当前页数据 page.setRecords(alarmHistories); - // 数据总条数 - page.setTotal(this.count()); + // 获取数据总条数(经过查询条件过滤后的) + params.put("pageFlag","noPage"); + Integer total = baseMapper.findPage(params).size(); + page.setTotal(total); return Result.OK(page); } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/vo/AlarmVo.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/vo/AlarmVo.java index c3e3a8ed..6101023e 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/vo/AlarmVo.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/vo/AlarmVo.java @@ -11,4 +11,6 @@ public class AlarmVo extends QueryRequest implements Serializable { private String startDate; private String endDate; private Integer pageStart; + // 标记：根据条件查询但不进行分页 + private String pageFlag; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java index e9a5febc..15c22bb9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java @@ -88,7 +88,8 @@ public class LoginController { //update-begin--Author:scott Date:20190805 for：暂时注释掉密码加密逻辑，有点问题 //update-begin-author:taoyan date:20190828 for:校验验证码 - String captcha = sysLoginModel.getCaptcha(); + + /* String captcha = sysLoginModel.getCaptcha(); if(captcha==null){ result.error500("验证码无效"); return result; @@ -107,7 +108,7 @@ public class LoginController { // 改成特殊的code 便于前端判断 result.setCode(HttpStatus.PRECONDITION_FAILED.value()); return result; - } + }*/ //update-end-author:taoyan date:20190828 for:校验验证码 //1. 校验用户是否有效 @@ -135,7 +136,7 @@ public class LoginController { //用户登录信息 userInfo(sysUser, result); //update-begin--Author:liusq Date:20210126 for：登录成功，删除redis中的验证码 - redisUtil.del(realKey); + //redisUtil.del(realKey); //update-begin--Author:liusq Date:20210126 for：登录成功，删除redis中的验证码 redisUtil.del(CommonConstant.LOGIN_FAIL + username); LoginUser loginUser = new LoginUser(); diff --git a/jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml b/jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml index 122699d8..fd53e604 100644 --- a/jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml +++ b/jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml @@ -12,8 +12,12 @@ jeecg-abnormal-alarm-start - - + + + org.jeecgframework.boot + jeecg-system-cloud-api + + org.jeecgframework.boot jeecg-module-abnormal-alarm diff --git a/jeecg-server-cloud/jeecg-log-manage-start/pom.xml b/jeecg-server-cloud/jeecg-log-manage-start/pom.xml index 3b61cf75..1ad7845d 100644 --- a/jeecg-server-cloud/jeecg-log-manage-start/pom.xml +++ b/jeecg-server-cloud/jeecg-log-manage-start/pom.xml @@ -12,6 +12,11 @@ jeecg-log-manage-start + + + org.jeecgframework.boot + jeecg-system-cloud-api + org.jeecgframework.boot jeecg-module-log-manage diff --git a/jeecg-server-cloud/jeecg-station-operation-start/pom.xml b/jeecg-server-cloud/jeecg-station-operation-start/pom.xml index a928046c..76b20966 100644 --- a/jeecg-server-cloud/jeecg-station-operation-start/pom.xml +++ b/jeecg-server-cloud/jeecg-station-operation-start/pom.xml @@ -12,6 +12,11 @@ jeecg-station-operation-start + + + org.jeecgframework.boot + jeecg-system-cloud-api + org.jeecgframework.boot jeecg-module-station-operation diff --git a/jeecg-server-cloud/jeecg-web-statistics-start/pom.xml b/jeecg-server-cloud/jeecg-web-statistics-start/pom.xml index f2c7f6dd..1c19ef8d 100644 --- a/jeecg-server-cloud/jeecg-web-statistics-start/pom.xml +++ b/jeecg-server-cloud/jeecg-web-statistics-start/pom.xml @@ -12,6 +12,11 @@ jeecg-web-statistics-start + + + org.jeecgframework.boot + jeecg-system-cloud-api + org.jeecgframework.boot jeecg-module-web-statistics From 306e5e65dd68d65d31bb6b17ec2e8bf1325dd3a0 Mon Sep 17 00:00:00 2001 From: panbaolin <123456> Date: Mon, 19 Jun 2023 19:55:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:1.=E6=8F=90=E4=BA=A4=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=B8=B8=E9=87=8F=E3=80=81ftp=E5=B7=A5=E5=85=B7=E7=B1=BB?= =?UTF-8?q?=E3=80=81=E9=82=AE=E4=BB=B6=E5=AE=9E=E4=BD=93=E3=80=81=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E6=97=A5=E5=BF=97=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/common/constant/EmailConstant.java | 9 ++++++ .../java/org/jeecg/common/util/FTPUtil.java | 6 ++-- .../jeecg/modules/base/entity/SysEmail.java | 16 +++++----- .../modules/base/entity/SysEmailLog.java | 31 +++++++++++-------- 4 files changed, 37 insertions(+), 25 deletions(-) create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/EmailConstant.java diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/EmailConstant.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/EmailConstant.java new file mode 100644 index 00000000..b547a7ee --- /dev/null +++ b/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"; +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java index 44f2e925..22e7468e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java @@ -50,11 +50,9 @@ public class FTPUtil { // 切换为本地被动模式，可以解决FTP上传后文件为空的问题，但需要服务器将FTP服务添加至防火墙白名单 ftp.enterLocalPassiveMode(); //连接 - ftp.connect("182.92.183.230", 21); -// ftp.connect(host, port); + ftp.connect(host, port); //登录 - ftp.login("xiao", "123456"); -// ftp.login(userName, password); + ftp.login(userName, password); //判断是否连接成功 int reply = ftp.getReplyCode(); if (!FTPReply.isPositiveCompletion(reply)) { diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java index b0a4f1f1..820cdccf 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java @@ -22,10 +22,10 @@ public class SysEmail implements Serializable { private String id; /** - * 邮箱名称 + * email服务地址 */ - @TableField(value = "name") - private String name; + @TableField(value = "email_server_address") + private String emailServerAddress; /** * 邮箱类型（1-收件地址，2-发件地址） @@ -34,7 +34,7 @@ public class SysEmail implements Serializable { private Integer emilType; /** - * email地址 + * 邮箱登录名称 */ @TableField(value = "username") private String username; @@ -49,7 +49,7 @@ public class SysEmail implements Serializable { * 端口 */ @TableField(value = "port") - private String port; + private Integer port; /** * 是否启用邮箱（0-不启用，1-启用） @@ -58,10 +58,10 @@ public class SysEmail implements Serializable { private Integer enabled; /** - * 监测周期（秒） + * 定时获取邮件时间周期(秒) */ - @TableField(value = "monitoring_cycle") - private Integer monitoringCycle; + @TableField(value = "receive_mail_fixed_cycle") + private Integer receiveMailFixedCycle; /** * 创建日期 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmailLog.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmailLog.java index 3d29f926..b46fff86 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmailLog.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmailLog.java @@ -7,10 +7,12 @@ 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 = "sys_email_log") public class SysEmailLog implements Serializable { @@ -18,34 +20,37 @@ 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; - - @TableField(value = "create_by") - private String createBy; - - @TableField(value = "update_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; - - @TableField(value = "update_by") - private String updateBy; - }