yangfeng há 1 ano atrás
pai
commit
40057b0b85

+ 1 - 0
web/src/main/java/com/ynfy/app/api/v1/controller/ApiAircleController.java

@@ -36,6 +36,7 @@ public class ApiAircleController extends ApiBaseController {
         if (StringUtils.isNotBlank(dto.getTitle())) {
             query.like(Article::getTitle, dto.getTitle());
         }
+        query.eq(Article::getStatus, 1); //已发布
         IPage<Article> pageList = articleService.page(page, query);
         return Result.OK(pageList);
     }

+ 13 - 1
web/src/main/java/com/ynfy/app/api/v1/controller/ApiIndexController.java

@@ -50,7 +50,8 @@ public class ApiIndexController extends ApiBaseController {
     @IgnoreAuth
     @PostMapping("/banner/list")
     public Result<?> list() {
-;        return Result.OK(bannerService.list());
+        ;
+        return Result.OK(bannerService.list());
     }
 
     /**
@@ -156,4 +157,15 @@ public class ApiIndexController extends ApiBaseController {
         return Result.OK(articleService.listRecommendArticle(limit));
     }
 
+    /**
+     * 查看资讯
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/viewArticle")
+    public Result<?> viewArticle(@RequestParam String id) {
+        return Result.OK(articleService.getById(id));
+    }
+
 }

+ 1 - 0
web/src/main/java/com/ynfy/buss/article/controller/ArticleController.java

@@ -67,6 +67,7 @@ public class ArticleController extends JeecgController<Article, IArticleService>
     //@RequiresPermissions("article:article:add")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody Article article) {
+        article.setStatus(1);
         articleService.save(article);
         return Result.OK("添加成功!");
     }

+ 10 - 2
web/src/main/java/com/ynfy/buss/article/entity/Article.java

@@ -59,6 +59,14 @@ public class Article implements Serializable {
     @Excel(name = "内容", width = 15)
     @ApiModelProperty(value = "内容")
     private String content;
+
+    /**
+     * 标签
+     */
+    @Excel(name = "标签", width = 15)
+    @ApiModelProperty(value = "标签")
+    private String tag;
+
     /**
      * 是否推荐
      */
@@ -93,8 +101,8 @@ public class Article implements Serializable {
     /**
      * createTime
      */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "createTime")
     private Date createTime;
     /**

+ 2 - 1
web/src/main/java/com/ynfy/buss/article/service/impl/ArticleServiceImpl.java

@@ -21,7 +21,8 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> impl
     @Override
     public List<Article> listRecommendArticle(Integer limit) {
         LambdaQueryWrapper<Article> query = new LambdaQueryWrapper<>();
-        query.eq(Article::getIsRecommend, true).last("LIMIT " + limit).orderByDesc(Article::getCreateTime);
+        query.eq(Article::getIsRecommend, true).eq(Article::getStatus, 1)
+                .last("LIMIT " + limit).orderByDesc(Article::getCreateTime);
         return list(query);
     }
 }