From d80480336bd62ed30ae89d70f107287fcb8cb159 Mon Sep 17 00:00:00 2001 From: cjw Date: Tue, 16 Jul 2024 10:39:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=B6=E8=97=8F=E3=80=81?= =?UTF-8?q?=E7=82=B9=E8=B5=9E=E3=80=81=E8=AE=B0=E5=BD=95=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portal/PersonSpaceController.java | 30 +++++++++++---- .../system/domain/vo/SysTextbookRecordVo.java | 33 ++++++++++++++++- .../mapper/SysTextbookRecordMapper.java | 9 ++++- .../service/ISysTextbookRecordService.java | 16 ++------ .../service/impl/SysOssPersonServiceImpl.java | 1 + .../impl/SysTextbookRecordServiceImpl.java | 37 +++++-------------- .../mapper/system/SysTextbookRecordMapper.xml | 16 ++++++-- 7 files changed, 88 insertions(+), 54 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PersonSpaceController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PersonSpaceController.java index 3a3eed0..af64a7e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PersonSpaceController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PersonSpaceController.java @@ -4,9 +4,11 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.bo.SysOssTextbookBo; -import org.dromara.system.domain.vo.SysOssTextbookVo; -import org.dromara.system.service.ISysOssTextbookService; +import org.dromara.system.constant.RecordTypeConstants; +import org.dromara.system.domain.bo.SysOssPersonBo; +import org.dromara.system.domain.vo.SysOssPersonVo; +import org.dromara.system.domain.vo.SysTextbookRecordVo; +import org.dromara.system.service.ISysOssPersonService; import org.dromara.system.service.ISysTextbookRecordService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,15 +28,29 @@ public class PersonSpaceController { private final ISysTextbookRecordService recordService; - private final ISysOssTextbookService textbookService; + private final ISysOssPersonService personService; /** * 查询我的上传 */ - @GetMapping("/textbook/pageList") - public TableDataInfo textbookList(SysOssTextbookBo bo, PageQuery pageQuery) { + @GetMapping("/oss/pageList") + public TableDataInfo textbookList(SysOssPersonBo bo, PageQuery pageQuery) { bo.setCreateBy(LoginHelper.getUserId()); - return textbookService.queryPageList(bo, pageQuery); + return personService.queryPageList(bo, pageQuery); } + @GetMapping("/like/pageList") + public TableDataInfo likeList(PageQuery pageQuery) { + return recordService.queryPageList(RecordTypeConstants.LIKE, pageQuery); + } + + @GetMapping("/collect/pageList") + public TableDataInfo collectList(PageQuery pageQuery) { + return recordService.queryPageList(RecordTypeConstants.COLLECT, pageQuery); + } + + @GetMapping("/record/pageList") + public TableDataInfo historyList(PageQuery pageQuery) { + return recordService.queryPageList(RecordTypeConstants.RECORD, pageQuery); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTextbookRecordVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTextbookRecordVo.java index e521aa3..6b76d6e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTextbookRecordVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTextbookRecordVo.java @@ -7,7 +7,7 @@ import org.dromara.system.domain.SysTextbookRecord; import java.io.Serial; import java.io.Serializable; - +import java.util.Date; /** @@ -34,5 +34,36 @@ public class SysTextbookRecordVo implements Serializable { */ private Integer recordType; + /** + * + */ + private Long ossId; + + /** + * + */ + private Long catalogId; + + /** + * 文件名 + */ + private String fileName; + + /** + * 文件路径 + */ + private String filePath; + + /** + * 文件后缀名 + */ + private String fileSuffix; + + private String createBy; + + private String createDept; + + private Date createTime; + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTextbookRecordMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTextbookRecordMapper.java index 1f96d09..e221f99 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTextbookRecordMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTextbookRecordMapper.java @@ -1,9 +1,13 @@ package org.dromara.system.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.system.domain.SysTextbookRecord; import org.dromara.system.domain.vo.SysTextbookRecordVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** * 同步教材记录Mapper接口 @@ -13,5 +17,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ @Mapper public interface SysTextbookRecordMapper extends BaseMapperPlus { - + Page selectPageList(@Param("page") Page page, + @Param(Constants.WRAPPER) Wrapper queryWrapper); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTextbookRecordService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTextbookRecordService.java index b1bec6f..80d527b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTextbookRecordService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTextbookRecordService.java @@ -2,11 +2,8 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysTextbookRecordBo; import org.dromara.system.domain.vo.SysTextbookRecordVo; -import java.util.List; - /** * 同步教材记录Service接口 * @@ -26,18 +23,11 @@ public interface ISysTextbookRecordService { /** * 分页查询同步教材记录列表 * - * @param bo 查询条件 - * @param pageQuery 分页参数 + * @param recordType 分类 + * @param pageQuery 分页参数 * @return 同步教材记录分页列表 */ - TableDataInfo queryPageList(SysTextbookRecordBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(Integer recordType, PageQuery pageQuery); - /** - * 查询符合条件的同步教材记录列表 - * - * @param bo 查询条件 - * @return 同步教材记录列表 - */ - List queryList(SysTextbookRecordBo bo); } 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 cff699a..3351b0f 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 @@ -96,6 +96,7 @@ public class SysOssPersonServiceImpl implements ISysOssPersonService { .eq(ObjectUtil.isNotNull(bo.getCreateBy()), "op.create_by", bo.getCreateBy()) .eq(ObjectUtil.isNotNull(bo.getType()), "op.type", bo.getType()) .eq(StringUtils.isNotEmpty(bo.getFileSuffix()), "op.file_suffix", bo.getFileSuffix()) + .eq(ObjectUtil.isNotNull(bo.getCreateBy()), "op.create_by", bo.getCreateBy()) .like(StringUtils.isNotEmpty(bo.getFileName()), "op.file_name", bo.getFileName()) .and(ObjectUtil.isNotNull(bo.getCatalogId()), w -> { List list = catalogService.selectList(new LambdaQueryWrapper() diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTextbookRecordServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTextbookRecordServiceImpl.java index 4e4ebdc..a21c5f9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTextbookRecordServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTextbookRecordServiceImpl.java @@ -1,21 +1,18 @@ package org.dromara.system.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.SysTextbookRecord; -import org.dromara.system.domain.bo.SysTextbookRecordBo; import org.dromara.system.domain.vo.SysTextbookRecordVo; import org.dromara.system.mapper.SysTextbookRecordMapper; import org.dromara.system.service.ISysTextbookRecordService; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Map; - /** * 同步教材记录Service业务层处理 * @@ -35,40 +32,24 @@ public class SysTextbookRecordServiceImpl implements ISysTextbookRecordService { * @return 同步教材记录 */ @Override - public SysTextbookRecordVo queryById(Long ossTextbookId){ + public SysTextbookRecordVo queryById(Long ossTextbookId) { return baseMapper.selectVoById(ossTextbookId); } /** * 分页查询同步教材记录列表 * - * @param bo 查询条件 * @param pageQuery 分页参数 * @return 同步教材记录分页列表 */ @Override - public TableDataInfo queryPageList(SysTextbookRecordBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo queryPageList(Integer recordType, PageQuery pageQuery) { + QueryWrapper wrapper = Wrappers.query(); + wrapper.eq("tr.record_type", recordType) + .eq("tr.create_by", LoginHelper.getUserId()) + .orderByDesc("tr.create_time"); + Page result = baseMapper.selectPageList(pageQuery.build(), wrapper); return TableDataInfo.build(result); } - /** - * 查询符合条件的同步教材记录列表 - * - * @param bo 查询条件 - * @return 同步教材记录列表 - */ - @Override - public List queryList(SysTextbookRecordBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(SysTextbookRecordBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - return lqw; - } - } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTextbookRecordMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTextbookRecordMapper.xml index 2446a2d..ff68efb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTextbookRecordMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTextbookRecordMapper.xml @@ -4,7 +4,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - replace into - +