From f63f2cd94e0689b04df1eeb296c797f1540188b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E8=8B=B1=E6=9D=B0?= <327782001@qq.com> Date: Fri, 27 Oct 2023 01:04:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CsdnController.java | 14 +++++++- .../springbootkwan/schedule/CsdnSchedule.java | 12 ++++--- .../service/CsdnUserInfoService.java | 10 ++++-- .../impl/CsdnTripletDayInfoServiceImpl.java | 6 +++- .../service/impl/CsdnUserInfoServiceImpl.java | 34 +++++++++++++++++++ 5 files changed, 68 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/kwan/springbootkwan/controller/CsdnController.java b/src/main/java/com/kwan/springbootkwan/controller/CsdnController.java index 9285ac2..979f42c 100644 --- a/src/main/java/com/kwan/springbootkwan/controller/CsdnController.java +++ b/src/main/java/com/kwan/springbootkwan/controller/CsdnController.java @@ -54,6 +54,18 @@ public class CsdnController { @GetMapping("/resetCurrentStatus") public Result resetCurrentStatus() { csdnUserInfoService.resetCurrentStatus(); - return Result.ok("重置当天状态完成"); + return Result.ok("重置新博客状态完成"); + } + + @GetMapping("/resetUserDayStatus") + public Result resetUserDayStatus() { + csdnUserInfoService.resetUserDayStatus(); + return Result.ok("重置新一天用户状态完成"); + } + + @GetMapping("/resetDayStatus") + public Result resetDayStatus() { + csdnUserInfoService.resetUserDayStatus(); + return Result.ok("重置新一天状态完成"); } } diff --git a/src/main/java/com/kwan/springbootkwan/schedule/CsdnSchedule.java b/src/main/java/com/kwan/springbootkwan/schedule/CsdnSchedule.java index f6141b6..070988e 100644 --- a/src/main/java/com/kwan/springbootkwan/schedule/CsdnSchedule.java +++ b/src/main/java/com/kwan/springbootkwan/schedule/CsdnSchedule.java @@ -1,7 +1,6 @@ package com.kwan.springbootkwan.schedule; import com.kwan.springbootkwan.service.CsdnAutoReplyService; -import com.kwan.springbootkwan.service.CsdnCommentService; import com.kwan.springbootkwan.service.CsdnService; import com.kwan.springbootkwan.service.CsdnTripletDayInfoService; import com.kwan.springbootkwan.service.CsdnUserInfoService; @@ -17,8 +16,6 @@ public class CsdnSchedule { @Autowired private CsdnService csdnService; @Autowired - private CsdnCommentService csdnCommentService; - @Autowired private CsdnUserInfoService csdnUserInfoService; @Autowired private CsdnAutoReplyService csdnAutoReplyService; @@ -40,12 +37,19 @@ public class CsdnSchedule { } @Scheduled(cron = "0 0/30 * * * ?") - public void executeInit() { + public void resetCurrentStatus() { log.info("executeInit task is running ... ..."); csdnUserInfoService.resetCurrentStatus(); log.info("executeInit task is finish ... ..."); } + @Scheduled(cron = "0 0 2 * * ?") + public void resetUserDayStatus() { + log.info("executeInit task is running ... ..."); + csdnUserInfoService.resetUserDayStatus(); + log.info("executeInit task is finish ... ..."); + } + @Scheduled(cron = "0 0 1 * * ?") public void resetTripletDayInfo() { log.info("resetTripletDayInfo task is running ... ..."); diff --git a/src/main/java/com/kwan/springbootkwan/service/CsdnUserInfoService.java b/src/main/java/com/kwan/springbootkwan/service/CsdnUserInfoService.java index 16ddd84..d0c2fde 100644 --- a/src/main/java/com/kwan/springbootkwan/service/CsdnUserInfoService.java +++ b/src/main/java/com/kwan/springbootkwan/service/CsdnUserInfoService.java @@ -10,9 +10,15 @@ import com.kwan.springbootkwan.entity.CsdnUserInfo; * @since 2023-10-23 16:03:14 */ public interface CsdnUserInfoService extends IService { - - + /** + * 重置新文章的状态 + */ void resetCurrentStatus(); + /** + * 重置新一天的状态 + */ + void resetUserDayStatus(); + } diff --git a/src/main/java/com/kwan/springbootkwan/service/impl/CsdnTripletDayInfoServiceImpl.java b/src/main/java/com/kwan/springbootkwan/service/impl/CsdnTripletDayInfoServiceImpl.java index 37bf420..b9b9379 100644 --- a/src/main/java/com/kwan/springbootkwan/service/impl/CsdnTripletDayInfoServiceImpl.java +++ b/src/main/java/com/kwan/springbootkwan/service/impl/CsdnTripletDayInfoServiceImpl.java @@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kwan.springbootkwan.entity.CsdnTripletDayInfo; import com.kwan.springbootkwan.mapper.CsdnTripletDayInfoMapper; import com.kwan.springbootkwan.service.CsdnTripletDayInfoService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Locale; import java.util.Objects; /** @@ -17,13 +19,15 @@ import java.util.Objects; * @author makejava * @since 2023-10-26 20:55:31 */ +@Slf4j @Service("csdnTripletDayInfoService") public class CsdnTripletDayInfoServiceImpl extends ServiceImpl implements CsdnTripletDayInfoService { @Override public CsdnTripletDayInfo todayInfo() { Date currentDate = new Date(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA); String formattedDate = sdf.format(currentDate); + log.info("当前日期是:{}", formattedDate); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("is_delete", 0); wrapper.eq("triplet_date", formattedDate); diff --git a/src/main/java/com/kwan/springbootkwan/service/impl/CsdnUserInfoServiceImpl.java b/src/main/java/com/kwan/springbootkwan/service/impl/CsdnUserInfoServiceImpl.java index 2777873..9437790 100644 --- a/src/main/java/com/kwan/springbootkwan/service/impl/CsdnUserInfoServiceImpl.java +++ b/src/main/java/com/kwan/springbootkwan/service/impl/CsdnUserInfoServiceImpl.java @@ -60,5 +60,39 @@ public class CsdnUserInfoServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq("is_delete", 0); + final List list = this.list(wrapper); + if (CollectionUtil.isNotEmpty(list)) { + for (CsdnUserInfo csdnUserInfo : list) { + final String userName = csdnUserInfo.getUserName(); + final List articles = csdnArticleService.getArticles(userName); + if (CollectionUtil.isNotEmpty(articles)) { + final BusinessInfoResponse.ArticleData.Article article = articles.get(0); + final String type = article.getType(); + if (StringUtils.equals(type, "blog")) { + //看看之前的状态 + final Integer likeStatus = csdnUserInfo.getLikeStatus(); + if (!LikeStatus.HAVE_ALREADY_LIKED.getCode().equals(likeStatus) && !LikeStatus.LIKE_SUCCESSFUL.getCode().equals(likeStatus)) { + csdnUserInfo.setLikeStatus(LikeStatus.UN_PROCESSED.getCode()); + } + final Integer collectStatus = csdnUserInfo.getCollectStatus(); + if (!CollectStatus.COLLECT_SUCCESSFUL.getCode().equals(collectStatus) && !CollectStatus.HAVE_ALREADY_COLLECT.getCode().equals(collectStatus)) { + csdnUserInfo.setCollectStatus(CollectStatus.UN_PROCESSED.getCode()); + } + final Integer commentStatus = csdnUserInfo.getCommentStatus(); + if (!CommentStatus.COMMENT_SUCCESSFUL.getCode().equals(commentStatus) && !CommentStatus.HAVE_ALREADY_COMMENT.getCode().equals(commentStatus)) { + csdnUserInfo.setCommentStatus(CommentStatus.UN_PROCESSED.getCode()); + } + this.updateById(csdnUserInfo); + } + } + } + } + } } + -- GitLab