|
@@ -55,9 +55,7 @@ public class LogHistoryServiceImpl extends BaseServiceImpl<LogHistoryMapper, Log
|
|
queryWrapper.eq(LogHistoryInfo::getUserId, dto.getUserId());
|
|
queryWrapper.eq(LogHistoryInfo::getUserId, dto.getUserId());
|
|
}
|
|
}
|
|
if (StringUtils.isNotEmpty(dto.getStartTime()) && StringUtils.isNotEmpty(dto.getEndTime())) {
|
|
if (StringUtils.isNotEmpty(dto.getStartTime()) && StringUtils.isNotEmpty(dto.getEndTime())) {
|
|
- String endTime = dto.getEndTime();
|
|
|
|
- endTime = DateUtil.format(DateUtils.addDays(DateUtil.parse(endTime, "yyyy-MM"), 1), "yyyy-MM");
|
|
|
|
- queryWrapper.between(LogHistoryInfo::getCreateTime, dto.getStartTime(), endTime);
|
|
|
|
|
|
+ queryWrapper.apply("DATE_FORMAT(create_time, '%Y-%m') BETWEEN '" + dto.getStartTime() + "' AND '" + dto.getEndTime() + "'");
|
|
} else {
|
|
} else {
|
|
//默认查询当月所有日志
|
|
//默认查询当月所有日志
|
|
LocalDate today = LocalDate.now();
|
|
LocalDate today = LocalDate.now();
|
|
@@ -104,13 +102,33 @@ public class LogHistoryServiceImpl extends BaseServiceImpl<LogHistoryMapper, Log
|
|
|
|
|
|
return voList.stream()
|
|
return voList.stream()
|
|
.collect(Collectors.groupingBy(vo -> {
|
|
.collect(Collectors.groupingBy(vo -> {
|
|
- LocalDateTime localDateTime = LocalDateTime.ofInstant(vo.getCreateTime().toInstant(), ZoneId.systemDefault());
|
|
|
|
- return localDateTime.toLocalDate().toString();
|
|
|
|
|
|
+ return formatDate(
|
|
|
|
+ vo.getCreateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().toString(),
|
|
|
|
+ "今天",
|
|
|
|
+ "昨天",
|
|
|
|
+ "前天");
|
|
}, LinkedHashMap::new, Collectors.toList()));
|
|
}, LinkedHashMap::new, Collectors.toList()));
|
|
}
|
|
}
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public static String formatDate(String dateStr, String todayStr, String yesterdayStr, String beforeYesterdayStr) {
|
|
|
|
+ LocalDate date = LocalDate.parse(dateStr);
|
|
|
|
+ LocalDate today = LocalDate.now();
|
|
|
|
+ if (date.equals(today)) {
|
|
|
|
+ return todayStr;
|
|
|
|
+ }
|
|
|
|
+ LocalDate yesterday = today.minusDays(1);
|
|
|
|
+ if (date.equals(yesterday)) {
|
|
|
|
+ return yesterdayStr;
|
|
|
|
+ }
|
|
|
|
+ LocalDate beforeYesterday = today.minusDays(2);
|
|
|
|
+ if (date.equals(beforeYesterday)) {
|
|
|
|
+ return beforeYesterdayStr;
|
|
|
|
+ }
|
|
|
|
+ return date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
|
|
|
+ }
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public boolean logSubmit(LogHistoryInfoDTO dto) {
|
|
public boolean logSubmit(LogHistoryInfoDTO dto) {
|
|
if (ObjectUtil.isEmpty(SecureUtil.getUser())) {
|
|
if (ObjectUtil.isEmpty(SecureUtil.getUser())) {
|
|
@@ -212,9 +230,9 @@ public class LogHistoryServiceImpl extends BaseServiceImpl<LogHistoryMapper, Log
|
|
|
|
|
|
//处理当前日志所有已读人信息
|
|
//处理当前日志所有已读人信息
|
|
List<LogHistoryInfoReadVO> readUsersInfo = jdbcTemplate.query("select * from c_log_history_read_record where log_id = " + vo.getId(), new BeanPropertyRowMapper<>(LogHistoryInfoReadVO.class));
|
|
List<LogHistoryInfoReadVO> readUsersInfo = jdbcTemplate.query("select * from c_log_history_read_record where log_id = " + vo.getId(), new BeanPropertyRowMapper<>(LogHistoryInfoReadVO.class));
|
|
- List<Long> userIds = readUsersInfo.stream().map(LogHistoryInfoReadVO::getUserId).distinct().collect(Collectors.toList());
|
|
|
|
|
|
+ List<String> userIds = readUsersInfo.stream().map(LogHistoryInfoReadVO::getUserId).distinct().map(String::valueOf).collect(Collectors.toList());
|
|
if (userIds.size() > 0) {
|
|
if (userIds.size() > 0) {
|
|
- List<User> readUserInfoList = iUserClient.userInfoByIds(userIds);
|
|
|
|
|
|
+ List<User> readUserInfoList = jdbcTemplate.query("select * from blade_user where id in(" + StringUtils.join(userIds, ",") + ")", new BeanPropertyRowMapper<>(User.class));
|
|
List<LogHistoryInfoVO.ReadUser> readUsers = new ArrayList<>();
|
|
List<LogHistoryInfoVO.ReadUser> readUsers = new ArrayList<>();
|
|
for (User userRead : readUserInfoList) {
|
|
for (User userRead : readUserInfoList) {
|
|
readUsers.add(new LogHistoryInfoVO.ReadUser(userRead.getAvatar(), userRead.getRealName()));
|
|
readUsers.add(new LogHistoryInfoVO.ReadUser(userRead.getAvatar(), userRead.getRealName()));
|