From e8d369c46c06c541e050be250e4d956fc2777dd4 Mon Sep 17 00:00:00 2001 From: nieziyan Date: Wed, 21 Jun 2023 14:48:47 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9ADate=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecg-module-abnormal-alarm/pom.xml | 6 +++++ .../controller/AlarmLogController.java | 25 +++++++++++++++++++ .../controller/SysEmailLogController.java | 25 ++++++++++++++++--- .../jeecg-abnormal-alarm-start/pom.xml | 5 ---- 4 files changed, 53 insertions(+), 8 deletions(-) diff --git a/jeecg-module-abnormal-alarm/pom.xml b/jeecg-module-abnormal-alarm/pom.xml index b15009c7..738e3429 100644 --- a/jeecg-module-abnormal-alarm/pom.xml +++ b/jeecg-module-abnormal-alarm/pom.xml @@ -16,6 +16,12 @@ + + + org.jeecgframework.boot + jeecg-system-cloud-api + + org.jeecgframework.boot jeecg-boot-base-core 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 e5f84f53..bc5d7bee 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 @@ -2,19 +2,29 @@ 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); } @@ -57,4 +67,19 @@ public class AlarmLogController { 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 data = new HashMap<>(); + data.put("userName","聂子炎"); + data.put("taskName","请假申请"); + message.setData(data); + sysBaseAPI.sendTemplateMessage(message); + } } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailLogController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailLogController.java index f12573c4..8809fb5b 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailLogController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailLogController.java @@ -17,6 +17,7 @@ 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; @@ -100,9 +101,18 @@ public class SysEmailLogController { String todayEnd = today + " 23:59:59"; wrapper.between(SysEmailLog::getReceiveTime,todayStart,todayEnd); List emailLogs = sysEmailLogService.list(wrapper); - List allTime = emailLogs.stream() + // 将Date转换为LocalDateTime + List allDate = emailLogs.stream() .map(SysEmailLog::getReceiveTime) .collect(Collectors.toList()); + List allTime = allDate.stream() + .map(item -> { + ZoneId zoneId = ZoneId.systemDefault(); + return item.toInstant() + .atZone(zoneId) + .toLocalDateTime(); + }) + .collect(Collectors.toList()); // 按照小时分组 Map statistic = new TreeMap<>(); Map> groupTime = allTime.stream() @@ -136,8 +146,17 @@ public class SysEmailLogController { Collection yData = new ArrayList<>(); Map statistic = new TreeMap<>(); Map result = new HashMap<>(); - List allDate = sysEmailLogService.listObjs(wrapper, + List allDate = sysEmailLogService.listObjs(wrapper, emailLog -> ((SysEmailLog) emailLog).getReceiveTime()); + // 将Date转换为LocalDateTime + List 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); @@ -147,7 +166,7 @@ public class SysEmailLogController { /* 支持跨年跨月选择 */ // 通过年月日进行分组 例:2023-06-06 DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE; - Map> group = allDate.stream() + Map> group = allTime.stream() .collect(Collectors.groupingBy(datetime -> datetime.format(formatter))); // 列举出startDate-endDate中所有日期(包括闰年) diff --git a/jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml b/jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml index fd53e604..7e5f8266 100644 --- a/jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml +++ b/jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml @@ -12,11 +12,6 @@ jeecg-abnormal-alarm-start - - - org.jeecgframework.boot - jeecg-system-cloud-api - org.jeecgframework.boot