|
|
@@ -10,7 +10,6 @@ import com.izouma.nineth.enums.netease.TeamType;
|
|
|
import com.izouma.nineth.exception.BusinessException;
|
|
|
import com.izouma.nineth.repo.netease.NeteaseMessageRepo;
|
|
|
import com.izouma.nineth.repo.netease.TeamRepo;
|
|
|
-import com.izouma.nineth.utils.DateTimeUtils;
|
|
|
import com.izouma.nineth.utils.JpaUtils;
|
|
|
import com.izouma.nineth.utils.SecurityUtils;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
@@ -20,7 +19,6 @@ import org.springframework.data.domain.PageImpl;
|
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import java.sql.Timestamp;
|
|
|
import java.time.Instant;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.ZoneId;
|
|
|
@@ -187,9 +185,10 @@ public class TeamService {
|
|
|
}
|
|
|
|
|
|
public Long getUnreadCount(String accid, String tid) {
|
|
|
- Long ts = (Long) redisTemplate.opsForValue().get(RedisKeys.USER_CHECKOUT_TIME + accid + ":" + tid);
|
|
|
- Long unreadCount = 0L;
|
|
|
- if (ts != null) {
|
|
|
+ Object object = redisTemplate.opsForValue().get(RedisKeys.USER_CHECKOUT_TIME + accid + ":" + tid);
|
|
|
+ Long unreadCount;
|
|
|
+ if (object != null) {
|
|
|
+ Long ts = Long.valueOf(object.toString());
|
|
|
Instant instant = Instant.ofEpochMilli(ts);
|
|
|
LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
|
|
|
unreadCount = neteaseMessageRepo.countAllByToIdAndOpeAndCreatedAtAfter(tid, 1, localDateTime);
|