ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整获取日志统计

Browse Source
This commit is contained in:
aikai 2024-04-28 11:19:43 +08:00
parent b530c9f977
commit 2fcf1c68ab
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java
View File

@ -172,14 +172,17 @@ public class LogStatisticsServiceImpl implements LogStatisticsService {
LogRuleDO logRuleDO = logRuleService.getLogRuleByFormId(dto.getFormId()); LogRuleDO logRuleDO = logRuleService.getLogRuleByFormId(dto.getFormId());
// 判断开始时间是否当天 / 是否本周 // 判断开始时间是否当天 / 是否本周
boolean flag = false; boolean flag = false;
Date begin = DateUtil.parse(dto.getBeginTime(), "yyyy-MM-dd").toJdkDate();
List<LogStatisticsDetailsVO> logStatisticsDOS = new ArrayList<>(); List<LogStatisticsDetailsVO> logStatisticsDOS = new ArrayList<>();
if (logRuleDO.getType() == 1) { List<String> dateList = new ArrayList<>();
flag = DateUtil.isSameDay(begin, new Date()); if (dto.getBeginTime() != null && dto.getEndTime() != null) {
} else if (logRuleDO.getType() == 2) { Date begin = DateUtil.parse(dto.getBeginTime(), "yyyy-MM-dd").toJdkDate();
flag = DateUtil.isSameWeek(begin, new Date(), true); if (logRuleDO.getType() == 1) {
flag = DateUtil.isSameDay(begin, new Date());
} else if (logRuleDO.getType() == 2) {
flag = DateUtil.isSameWeek(begin, new Date(), true);
}
dateList = DateUtils.betweenDayStrList(dto.getBeginTime(), dto.getEndTime());
} }
List<String> dateList = DateUtils.betweenDayStrList(dto.getBeginTime(), dto.getEndTime());
// 这里将区间转换为具体的日期 因为mysql BETWEEN 会导致索引失效 // 这里将区间转换为具体的日期 因为mysql BETWEEN 会导致索引失效
if (flag) { if (flag) {
logStatisticsDOS = logStatisticsMapper.getCurrentStatistics(dto.getFormId(), dateList); logStatisticsDOS = logStatisticsMapper.getCurrentStatistics(dto.getFormId(), dateList);