From d807fd2490a86bc99bb5abbe9566a63af63a6131 Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Thu, 25 Aug 2022 04:05:49 +0800
Subject: [PATCH] 实体补充字段
---
snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/controller/BlogArticleOutsideController.java | 145 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 135 insertions(+), 10 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 c2169f5..7fb96dd 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,15 +25,19 @@
package vip.xiaonuo.modular.blogarticle.controller;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUnit;
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 lombok.extern.slf4j.Slf4j;
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.consts.SymbolConstant;
import vip.xiaonuo.core.context.constant.ConstantContextHolder;
import vip.xiaonuo.core.enums.LogAnnotionOpTypeEnum;
import vip.xiaonuo.core.exception.BlogException;
@@ -41,9 +45,9 @@
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.entity.BlogArticleVo;
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;
@@ -51,10 +55,9 @@
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;
+import java.util.*;
+import java.util.concurrent.Future;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -65,6 +68,7 @@
*/
@RestController
@RequestMapping("/outside")
+@Slf4j
public class BlogArticleOutsideController {
@Resource
@@ -80,7 +84,7 @@
@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")) {
+ if (!SecureUtil.md5(addDto.getSecret()).equals(ConstantContextHolder.getPushCode())) {
throw new BlogException("口令错误..");
}
@@ -124,7 +128,7 @@
BlogArticle article = new BlogArticle();
BeanUtil.copyProperties(addDto, article);
article.setSeparateYear(DateUtil.year(article.getPublishDate()));
- article.setSeparateMonth(DateUtil.month(article.getPublishDate())+1);
+ article.setSeparateMonth(DateUtil.month(article.getPublishDate()) + 1);
article.setSeparateDay(DateUtil.dayOfMonth(article.getPublishDate()));
article.setIsEnable(MyConstant.Yes);
@@ -147,8 +151,14 @@
param.put("pageNo", PageUtil.getStart(queryDto.getPageNo() - 1, queryDto.getPageSize()));
param.put("pageSize", queryDto.getPageSize());
param.put("typeId", queryDto.getTypeId());
+ param.put("fileType", queryDto.getFileType());
+ param.put("faceExcludeFile", MyConstant.faceExcludeFile);
String blogSourcePrefix = ConstantContextHolder.getBlogSourcePrefix();
+
+ Date now = DateUtil.date();
+ //空类型查询条件,排除笔记系列,按更新时间倒序
+ //含有类型查询,按发布时间倒序
List<BlogArticleVo> resList = blogArticleService.searchList(param).stream().map(e -> {
if (StrUtil.isNotEmpty(e.getCoverFileURL())) {
if (!e.getCoverFileURL().startsWith("http")) {
@@ -156,10 +166,78 @@
e.setCoverFileURL(blogSourcePrefix + e.getCoverFileURL());
}
}
+
+ //前端根据条件标注小红点(发布时间小于更新时间,且在7天内)
+ if (e.getPublishDate().before(e.getUpdateDate())
+ && DateUtil.between(e.getUpdateDate(), now, DateUnit.DAY) <= 7) {
+ e.setIsAnyUpdate(MyConstant.Yes);
+ } else {
+ e.setIsAnyUpdate(MyConstant.No);
+ }
+
return e;
}).collect(Collectors.toList());
long count = blogArticleService.searchListCount(param);
+
+ Page<BlogArticleVo> queryPage = new Page<>(queryDto.getPageNo(), queryDto.getPageSize());
+ queryPage.setRecords(resList);
+ queryPage.setTotal(count);
+
+ return new SuccessResponseData(queryPage);
+ }
+
+
+ /**
+ * 查询blog文章（月台专用列表）
+ *
+ * @author inleft
+ * @date 2022-02-09 18:20:22
+ */
+ @GetMapping("/blogArticle/platform")
+ @BusinessLog(title = "外部blog系统_blog月台_查询", opType = LogAnnotionOpTypeEnum.QUERY)
+ public ResponseData platform(BlogArticleQueryDto queryDto) {
+
+ Map<String, Object> param = new HashMap<>(16);
+ param.put("pageNo", PageUtil.getStart(queryDto.getPageNo() - 1, queryDto.getPageSize()));
+ param.put("pageSize", queryDto.getPageSize());
+ param.put("id", queryDto.getId());
+
+ if (queryDto.getActiveKey().equals(MyConstant.platformType.type_1)) {
+ param.put("typeIds", new Long[]{66L});//临时id
+ param.put("fileType", MyConstant.FileType.fileTypeVideo_3);
+ } else if (queryDto.getActiveKey().equals(MyConstant.platformType.type_2)) {
+ param.put("typeIds", new Long[]{55L});//临时id,后续需要修改(前方高能分类)
+ param.put("fileType", MyConstant.FileType.fileTypeVideo_3);
+ } else if (queryDto.getActiveKey().equals(MyConstant.platformType.type_3)) {
+ param.put("typeIds", new Long[]{99L});//临时id,后续需要修改(图组)
+ param.put("fileType", MyConstant.FileType.fileTypePictures_5);
+ } else {
+ param.put("typeIds", new Long[]{66L});//临时id,后续需要修改(音乐分类)
+ param.put("fileType", MyConstant.FileType.fileTypeVideo_3);
+ }
+
+ String blogSourcePrefix = ConstantContextHolder.getBlogSourcePrefix();
+
+ //空类型查询条件,排除笔记系列,按更新时间倒序
+ //含有类型查询,按发布时间倒序
+ List<BlogArticleVo> resList = blogArticleService.searchPlatformList(param).stream().map(e -> {
+ if (StrUtil.isNotEmpty(e.getCoverFileURL())) {
+ if (!e.getCoverFileURL().startsWith("http")) {
+ //补上访问参数
+ e.setCoverFileURL(blogSourcePrefix + e.getCoverFileURL());
+ }
+ }
+
+ //补充视频组,图片组的url
+ if (StrUtil.isNotEmpty(e.getPictureIds())) {
+ e.setPictureUrlList(this.getBlogSourceURLBatch(Arrays.stream(e.getPictureIds().split(SymbolConstant.COMMA)).collect(Collectors.toList())));
+ }
+
+ return e;
+ }).collect(Collectors.toList());
+
+ long count = blogArticleService.searchPlatformListCount(param);
Page<BlogArticleVo> queryPage = new Page<>(queryDto.getPageNo(), queryDto.getPageSize());
queryPage.setRecords(resList);
@@ -188,24 +266,50 @@
throw new BlogException(BlogExceptionEnum.article_auth_error);
}
//授权码比对
- if (!SecureUtil.md5(find.getAuthPassword()).equals(queryDto.getAuthWord())) {
+ if (!find.getAuthPassword().equals(queryDto.getAuthWord())) {
throw new BlogException(BlogExceptionEnum.article_auth_pass_error);
}
} else if (find.getAuthStatus().equals(MyConstant.AuthStatus.privateCode)) {
throw new BlogException(BlogExceptionEnum.article_auth_private_error);
}
+ //异步查询相邻记录
+ Future<List<BlogArticleVo>> adjoiningRecord = blogArticleService.getAdjoiningRecord(queryDto);
+
BlogArticleVo vo = new BlogArticleVo();
BeanUtil.copyProperties(find, vo);
+ //补充视频组,图片组的url
+ if (StrUtil.isNotEmpty(vo.getPictureIds())) {
+ vo.setPictureUrlList(this.getBlogSourceURLBatch(Arrays.stream(vo.getPictureIds().split(SymbolConstant.COMMA)).collect(Collectors.toList())));
+ }
+ if (StrUtil.isNotEmpty(vo.getVideoIds())) {
+ vo.setVideoUrlList(this.getBlogSourceURLBatch(Arrays.stream(vo.getVideoIds().split(SymbolConstant.COMMA)).collect(Collectors.toList())));
+ }
+
String tempURL = this.getBlogSourceURL(find.getArticleFileId());
- if (StrUtil.isEmpty(tempURL))
- throw new BlogException(BlogExceptionEnum.article_file_lose);
+ //if (StrUtil.isEmpty(tempURL))
+ //throw new BlogException(BlogExceptionEnum.article_file_lose);
vo.setArticleFileURL(tempURL);
+ vo.setCoverFileURL(this.getBlogSourceURL(vo.getCoverFileId()));
+
+ while (!adjoiningRecord.isDone()) {
+ try {
+ Thread.sleep(50);
+ } catch (InterruptedException e) {
+ }
+ }
+
+ try {
+ vo.setPreviousRecord(adjoiningRecord.get().get(0));
+ vo.setNextRecord(adjoiningRecord.get().get(1));
+ } catch (Exception e) {
+ log.error("异步获取上下相邻日志id异常,id:{} ,msg:{}", queryDto.getId(), e.getMessage());
+ }
return new SuccessResponseData(vo);
}
@@ -220,4 +324,25 @@
}
}
+ private List<String> getBlogSourceURLBatch(List<String> fileIds) {
+ Map<String, SysFileInfo> sysFileInfoMap = fileInfoService.listByIds(fileIds).stream().collect(Collectors.toMap(e -> e.getId().toString(), Function.identity(), (k1, k2) -> k1));
+ if (CollUtil.isEmpty(sysFileInfoMap)) {
+ return null;
+ } else {
+ List<String> urlList = new ArrayList<>(fileIds.size());
+ String blogSourcePrefix = ConstantContextHolder.getBlogSourcePrefix();
+
+ SysFileInfo sysFileInfo;
+ for (String fileId : fileIds) {
+ sysFileInfo = sysFileInfoMap.getOrDefault(fileId, null);
+ if (sysFileInfo == null) {
+ urlList.add(null);
+ } else {
+ urlList.add(blogSourcePrefix + sysFileInfo.getFileBucket() + "/" + sysFileInfo.getFileObjectName());
+ }
+ }
+ return urlList;
+ }
+ }
+
}
--
Gitblit v1.9.1