From 76f57604fede61aafb0d30c49e4d57d4a3f1deb4 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 7 Apr 2023 16:37:55 +0800 Subject: [PATCH] code format --- .../modules/cms/service/ArticleService.java | 24 +++++++------------ .../modules/cms/service/CommentService.java | 2 +- .../modules/cms/service/ReportService.java | 2 +- .../modules/cms/service/SiteService.java | 2 +- .../modules/cms/service/TagService.java | 2 +- .../modules/cms/service/VisitLogService.java | 2 +- .../modules/msg/service/MsgInnerService.java | 2 +- 7 files changed, 14 insertions(+), 22 deletions(-) diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java index 989743b1..49ec54bf 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java @@ -23,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -84,12 +83,7 @@ public class ArticleService extends CrudService { */ @Override public Page
findPage(Article article) { - updateExpiredWeightThreadPool.submit(new Runnable() { - @Override - public void run() { - updateExpiredWeight(article); - } - }); + updateExpiredWeightThreadPool.submit(() -> updateExpiredWeight(article)); return super.findPage(article); } @@ -98,17 +92,15 @@ public class ArticleService extends CrudService { * @return new Object[]{栏目Id,内容Id,内容标题} */ public List findByIds(String ids) { - if (ids == null) { - return new ArrayList(); - } List list = ListUtils.newArrayList(); - String[] idss = StringUtils.split(ids, ","); - Article where = new Article(); - where.setId_in(idss); - List
l = dao.findList(where); - for (Article e : l) { - list.add(new Object[] { e.getCategory().getId(), e.getId(), StringUtils.abbr(e.getTitle(), 50) }); + if (ids == null) { + return list; } + Article where = new Article(); + where.setId_in(StringUtils.split(ids, ",")); + dao.findList(where).forEach((e) -> { + list.add(new Object[] { e.getCategory().getId(), e.getId(), StringUtils.abbr(e.getTitle(), 50) }); + }); return list; } diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/CommentService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/CommentService.java index d4882b63..b00c07c6 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/CommentService.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/CommentService.java @@ -34,7 +34,7 @@ public class CommentService extends CrudService { /** * 查询分页数据 * @param comment 查询条件 - * @param comment.page 分页对象 + * @param comment page 分页对象 * @return */ @Override diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/ReportService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/ReportService.java index 847f55b8..58a3722d 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/ReportService.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/ReportService.java @@ -34,7 +34,7 @@ public class ReportService extends CrudService { /** * 查询分页数据 * @param report 查询条件 - * @param report.page 分页对象 + * @param report page 分页对象 * @return */ @Override diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/SiteService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/SiteService.java index 658eccc5..aa6c1f42 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/SiteService.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/SiteService.java @@ -35,7 +35,7 @@ public class SiteService extends CrudService { /** * 查询分页数据 * @param site 查询条件 - * @param site.page 分页对象 + * @param site page 分页对象 * @return */ @Override diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/TagService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/TagService.java index b7742d47..327daf5e 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/TagService.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/TagService.java @@ -33,7 +33,7 @@ public class TagService extends CrudService { /** * 查询分页数据 * @param tag 查询条件 - * @param tag.page 分页对象 + * @param tag page 分页对象 * @return */ @Override diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/VisitLogService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/VisitLogService.java index 4df6c89c..611d9bf4 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/VisitLogService.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/VisitLogService.java @@ -34,7 +34,7 @@ public class VisitLogService extends CrudService { /** * 查询分页数据 * @param visitLog 查询条件 - * @param visitLog.page 分页对象 + * @param visitLog page 分页对象 * @return */ @Override diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java b/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java index f594e1ef..79577957 100644 --- a/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java +++ b/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java @@ -60,7 +60,7 @@ public class MsgInnerService extends CrudService { /** * 查询分页数据 - * @param msgInner 查询条件;.page 分页对象 + * @param msgInner 查询条件; page 分页对象 * @return */ @Override