From 0a61a6e8cf466c1ddad3d517dcf8e78b1a6e6052 Mon Sep 17 00:00:00 2001 From: cjw Date: Tue, 16 Jul 2024 14:17:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E6=88=B7=E5=90=8C=E6=AD=A5=E6=95=99?= =?UTF-8?q?=E6=9D=90=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E7=82=B9=E8=B5=9E=E3=80=81=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/SysOssPersonController.java | 8 ++++- .../system/domain/vo/SysOssTextbookVo.java | 3 ++ .../service/impl/SysOssPersonServiceImpl.java | 4 +++ .../impl/SysOssTextbookServiceImpl.java | 31 ++++++++++--------- 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java index be0cf74..f0280ce 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java @@ -128,7 +128,13 @@ public class SysOssPersonController extends BaseController { sysOssPersonService.download(id, response); } - + /** + * 预览 + * + * @param id + * @return + * @throws Exception + */ @SaCheckPermission("file:person:preview") @PostMapping("/preview/{id}") public R preview(@NotNull(message = "主键不能为空") @PathVariable Long id) throws Exception { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java index 92818e8..7f5c595 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java @@ -79,6 +79,9 @@ public class SysOssTextbookVo implements Serializable { @Translation(type = TransConstant.DEPT_ID_TO_NAME) private Long createDept; + private Boolean isLike; + private Boolean isCollect; + diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java index 3351b0f..5c07436 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java @@ -32,6 +32,7 @@ import org.dromara.system.service.ISysOssService; import org.springframework.stereotype.Service; import java.util.Collection; +import java.util.Date; import java.util.List; /** @@ -237,6 +238,9 @@ public class SysOssPersonServiceImpl implements ISysOssPersonService { date.setFileSuffix(ossPerson.getFileSuffix()); date.setFilePath(path); date.setType(ossPerson.getType()); + date.setCreateDept(ossPerson.getCreateDept()); + date.setCreateBy(ossPerson.getCreateBy()); + date.setCreateTime(new Date()); return textbookMapper.insert(date) > 0; } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java index ed6634d..a432926 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java @@ -306,7 +306,6 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { @Override public Boolean like(OperateOssTextbookBo bo) { - Long userId = LoginHelper.getUserId(); Integer operate = bo.getOperate(); Long ossTextbookId = bo.getOssTextbookId(); SysTextbookRecord data = new SysTextbookRecord(); @@ -316,10 +315,7 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { baseMapper.addLikeNum(ossTextbookId); textbookRecordMapper.insert(data); } else { - textbookRecordMapper.delete(new LambdaQueryWrapper() - .eq(SysTextbookRecord::getOssTextbookId, data.getOssTextbookId()) - .eq(SysTextbookRecord::getRecordType, data.getRecordType()) - .eq(SysTextbookRecord::getCreateBy, userId)); + textbookRecordMapper.delete(buildRecordQueryWrapper(data)); baseMapper.subLikeNum(ossTextbookId); } return true; @@ -327,7 +323,6 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { @Override public Boolean collect(OperateOssTextbookBo bo) { - Long userId = LoginHelper.getUserId(); Integer operate = bo.getOperate(); Long ossTextbookId = bo.getOssTextbookId(); SysTextbookRecord data = new SysTextbookRecord(); @@ -337,10 +332,7 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { baseMapper.addCollectNum(ossTextbookId); textbookRecordMapper.insert(data); } else { - textbookRecordMapper.delete(new LambdaQueryWrapper() - .eq(SysTextbookRecord::getOssTextbookId, data.getOssTextbookId()) - .eq(SysTextbookRecord::getRecordType, data.getRecordType()) - .eq(SysTextbookRecord::getCreateBy, userId)); + textbookRecordMapper.delete(buildRecordQueryWrapper(data)); baseMapper.subCollectNum(ossTextbookId); } return true; @@ -348,18 +340,27 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { @Override public SysOssTextbookVo browseById(Long id) { - Long userId = LoginHelper.getUserId(); SysOssTextbookVo ossTextbookVo = baseMapper.selectVoById(id); SysTextbookRecord data = new SysTextbookRecord(); data.setOssTextbookId(id); data.setRecordType(RecordTypeConstants.RECORD); //不管如何先删再添加 - textbookRecordMapper.delete(new LambdaQueryWrapper() + textbookRecordMapper.delete(buildRecordQueryWrapper(data)); + textbookRecordMapper.insert(data); + //是否点赞 + data.setRecordType(RecordTypeConstants.LIKE); + ossTextbookVo.setIsLike(textbookRecordMapper.exists(buildRecordQueryWrapper(data))); + //是否收藏 + data.setRecordType(RecordTypeConstants.COLLECT); + ossTextbookVo.setIsCollect(textbookRecordMapper.exists(buildRecordQueryWrapper(data))); + return ossTextbookVo; + } + + private LambdaQueryWrapper buildRecordQueryWrapper(SysTextbookRecord data) { + return new LambdaQueryWrapper() .eq(SysTextbookRecord::getOssTextbookId, data.getOssTextbookId()) .eq(SysTextbookRecord::getRecordType, data.getRecordType()) - .eq(SysTextbookRecord::getCreateBy, userId)); - textbookRecordMapper.insert(data); - return ossTextbookVo; + .eq(SysTextbookRecord::getCreateBy, LoginHelper.getUserId()); } private List processFormatSuffixQuery(int format) {