文章-v0.0.7

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/article/ArticleSercieImp.java

@@ -498,7 +498,7 @@ public class ArticleSercieImp implements ArticleServiceInterface {
     @Override
     public Mono<RStatus<Paged<ArticleOutRes>>> byLableGetArticle(Long labelId, Integer page, Integer size) {
         StringBuilder startSql = new StringBuilder();
-        startSql.append("SELECT id,front_cover,title FROM article WHERE deleted_at IS  NULL ");
+        startSql.append("SELECT id,front_cover,title,date_time_str FROM article WHERE deleted_at IS  NULL ");
         StringBuilder startSqlCount= new StringBuilder(" SELECT id FROM article WHERE deleted_at IS  NULL ");
         StringBuilder stringBuilder =new StringBuilder();
         Criteria empty =Criteria.empty();
@@ -516,7 +516,7 @@ public class ArticleSercieImp implements ArticleServiceInterface {
         Mono<Paged<ArticleOutRes>> pagedMono = listMono.flatMap(labelManagements -> {
             if (!labelManagements.isEmpty()) {
                 labelManagements.stream().map(LabelManagement::name).forEach(labelManagement -> {
-                    stringBuilder.append(" OR  labels like ");
+                    stringBuilder.append(" AND  labels like ");
                     stringBuilder.append(" '%").append(labelManagement).append("%' ");
                 });
             }else {
@@ -534,7 +534,7 @@ public class ArticleSercieImp implements ArticleServiceInterface {
                     ArticleOutRes articleRes = new ArticleOutRes();
                     articleRes.setId(row.get("id", Long.class));
                     articleRes.setTitle(row.get("title", String.class));
-//                    articleRes.setDateTimeStr(row.get("date_time_str", String.class));
+                    articleRes.setDateTimeStr(row.get("date_time_str", String.class));
 //                    articleRes.setAuthor(row.get("author", String.class));
 //                    articleRes.setLabels(row.get("labels", String.class));
 //                    articleRes.setSendFriends(row.get("send_friends", Integer.class));
@@ -553,7 +553,9 @@ public class ArticleSercieImp implements ArticleServiceInterface {
                     return articleRes;
                 }).all().collectList();
                 return Mono.zip(Mono.just(list.size()), listMono1).flatMap(objects -> {
-                    List<ArticleOutRes> collect = objects.getT2().stream().sorted(Comparator.comparing(ArticleOutRes::getDateTimeStr)).collect(Collectors.toList());
+                    List<ArticleOutRes> collect = objects.getT2().stream().filter(articleOutRes -> Objects.nonNull(articleOutRes.getDateTimeStr()))
+                            .sorted(Comparator.comparing(ArticleOutRes::getDateTimeStr))
+                            .collect(Collectors.toList());
                     Paged<ArticleOutRes> articleResPaged =
                             new Paged<>(Long.valueOf(objects.getT1()),collect
                                    , page, size);
@@ -681,7 +683,7 @@ public class ArticleSercieImp implements ArticleServiceInterface {
     @Override
     public Mono<RStatus<Paged<ArticleOutRes>>> byLableNameGetArticle(String name, Integer page, Integer size) {
         StringBuilder startSql = new StringBuilder();
-        startSql.append("SELECT id,front_cover,title FROM article WHERE deleted_at IS  NULL ");
+        startSql.append("SELECT id,front_cover,title,date_time_str FROM article WHERE deleted_at IS  NULL ");
         StringBuilder startSqlCount= new StringBuilder(" SELECT id FROM article WHERE deleted_at IS  NULL ");
         StringBuilder stringBuilder =new StringBuilder();
         Criteria empty =Criteria.empty();
@@ -718,7 +720,7 @@ public class ArticleSercieImp implements ArticleServiceInterface {
                     ArticleOutRes articleRes = new ArticleOutRes();
                     articleRes.setId(row.get("id", Long.class));
                     articleRes.setTitle(row.get("title", String.class));
-//                    articleRes.setDateTimeStr(row.get("date_time_str", String.class));
+                    articleRes.setDateTimeStr(row.get("date_time_str", String.class));
 //                    articleRes.setAuthor(row.get("author", String.class));
 //                    articleRes.setLabels(row.get("labels", String.class));
 //                    articleRes.setSendFriends(row.get("send_friends", Integer.class));