From 31e475bd52f8b4decb9614028a0046f67d224f5c Mon Sep 17 00:00:00 2001 From: inleft <inleft@qq.com> Date: Tue, 22 Feb 2022 00:14:16 +0800 Subject: [PATCH] 补充文章上传细节 --- snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/controller/BlogArticleOutsideController.java | 75 +++++++++++++++++++++++++++++++++++-- 1 files changed, 71 insertions(+), 4 deletions(-) diff --git a/snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/controller/BlogArticleOutsideController.java b/snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/controller/BlogArticleOutsideController.java index 0889227..b206a94 100644 --- a/snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/controller/BlogArticleOutsideController.java +++ b/snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/controller/BlogArticleOutsideController.java @@ -25,13 +25,13 @@ package vip.xiaonuo.modular.blogarticle.controller; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.PageUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.consts.MyConstant; import vip.xiaonuo.core.context.constant.ConstantContextHolder; @@ -41,13 +41,17 @@ import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.modular.blogarticle.entity.BlogArticle; +import vip.xiaonuo.modular.blogarticle.param.BlogArticleAddDto; import vip.xiaonuo.modular.blogarticle.param.BlogArticleQueryDto; import vip.xiaonuo.modular.blogarticle.param.BlogArticleVo; import vip.xiaonuo.modular.blogarticle.service.BlogArticleService; +import vip.xiaonuo.modular.blogarticletype.entity.BlogArticleType; +import vip.xiaonuo.modular.blogarticletype.service.BlogArticleTypeService; import vip.xiaonuo.sys.modular.file.entity.SysFileInfo; import vip.xiaonuo.sys.modular.file.service.SysFileInfoService; import javax.annotation.Resource; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -68,7 +72,69 @@ @Resource + private BlogArticleTypeService blogArticleTypeService; + + @Resource private SysFileInfoService fileInfoService; + + @PostMapping("/blogArticle/add") + @BusinessLog(title = "外部blog系统_blog文章_增加", opType = LogAnnotionOpTypeEnum.ADD) + public ResponseData add(@RequestBody @Validated(BlogArticleAddDto.add.class) BlogArticleAddDto addDto) { + if (!SecureUtil.md5(addDto.getSecret()).equals("b49e4cc48616cfb8d5ed3e5b983165c8")) { + throw new BlogException("口令错误.."); + } + + if (MyConstant.Yes.equals(addDto.getIsTop()) && addDto.getTopValue() == null) { + throw new BlogException("选择了置顶需要指定置顶值.."); + } + + if (addDto.getIsLock().equals(MyConstant.Yes)) { + if (addDto.getAuthStatus().equals(MyConstant.AuthStatus.authCode) && StrUtil.isEmpty(addDto.getAuthPassword())) { + throw new BlogException("选择了密码授权,密码不能为空"); + } + } else { + addDto.setAuthPassword(null); + } + + if (MyConstant.Yes.equals(addDto.getIsOnline())) { + if (addDto.getArticleFileId() == null || fileInfoService.getById(addDto.getArticleFileId()) == null) { + throw new BlogException("已选择在线模式..文件id非法"); + } + } else { + if (StrUtil.isEmpty(addDto.getContent())) { + throw new BlogException("已选择在线模式..文件内容非法"); + } + } + + if (addDto.getCoverFileId() != null && fileInfoService.getById(addDto.getCoverFileId()) == null) { + throw new BlogException("封面文件id非法"); + } + + if (blogArticleTypeService.lambdaQuery() + .eq(BlogArticleType::getIsEnable, MyConstant.Yes) + .eq(BlogArticleType::getId, addDto.getArticleTypeId()) + .one() == null) { + throw new BlogException("分类id非法"); + } + + if (addDto.getPublishDate() == null) { + addDto.setPublishDate(new Date()); + } + + BlogArticle article = new BlogArticle(); + BeanUtil.copyProperties(addDto, article); + article.setSeparateYear(DateUtil.year(article.getPublishDate())); + article.setSeparateMonth(DateUtil.month(article.getPublishDate())); + article.setSeparateDay(DateUtil.dayOfMonth(article.getPublishDate())); + + article.setIsEnable(MyConstant.Yes); + blogArticleService.save(article); + System.out.println(article.toString()); + + +// blogArticleService.add(blogArticleParam); + return new SuccessResponseData(); + } /** * 查询blog文章 @@ -139,6 +205,7 @@ if (queryDto.getId() % 2 == 0) { String tempURL = this.getBlogSourceURL(find.getArticleFileId()); + if (StrUtil.isEmpty(tempURL)) throw new BlogException(BlogExceptionEnum.article_file_lose); @@ -156,7 +223,7 @@ return null; } else { String blogSourcePrefix = ConstantContextHolder.getBlogSourcePrefix(); - return blogSourcePrefix + sysFileInfo.getFileBucket() + sysFileInfo.getFileObjectName(); + return blogSourcePrefix + sysFileInfo.getFileBucket() +"/"+ sysFileInfo.getFileObjectName(); } } -- Gitblit v1.9.1