mozhe
/
school-file-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增收藏、点赞、记录分页查询列表

This commit is contained in:
cjw 2024-07-16 10:39:30 +08:00
parent dc9a8f52b6
commit d80480336b
7 changed files with 88 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PersonSpaceController.java
View File

@ -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<SysOssTextbookVo> textbookList(SysOssTextbookBo bo, PageQuery pageQuery) {
@GetMapping("/oss/pageList")
public TableDataInfo<SysOssPersonVo> textbookList(SysOssPersonBo bo, PageQuery pageQuery) {
bo.setCreateBy(LoginHelper.getUserId());
return textbookService.queryPageList(bo, pageQuery);
return personService.queryPageList(bo, pageQuery);
}
@GetMapping("/like/pageList")
public TableDataInfo<SysTextbookRecordVo> likeList(PageQuery pageQuery) {
return recordService.queryPageList(RecordTypeConstants.LIKE, pageQuery);
}
@GetMapping("/collect/pageList")
public TableDataInfo<SysTextbookRecordVo> collectList(PageQuery pageQuery) {
return recordService.queryPageList(RecordTypeConstants.COLLECT, pageQuery);
}
@GetMapping("/record/pageList")
public TableDataInfo<SysTextbookRecordVo> historyList(PageQuery pageQuery) {
return recordService.queryPageList(RecordTypeConstants.RECORD, pageQuery);
}
}

33
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTextbookRecordVo.java
View File

@ -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;
}

9
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTextbookRecordMapper.java
View File

@ -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<SysTextbookRecord, SysTextbookRecordVo> {
Page<SysTextbookRecordVo> selectPageList(@Param("page") Page<SysTextbookRecord> page,
@Param(Constants.WRAPPER) Wrapper<SysTextbookRecord> queryWrapper);
}

16
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTextbookRecordService.java
View File

@ -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<SysTextbookRecordVo> queryPageList(SysTextbookRecordBo bo, PageQuery pageQuery);
TableDataInfo<SysTextbookRecordVo> queryPageList(Integer recordType, PageQuery pageQuery);
/**
* 查询符合条件的同步教材记录列表
*
* @param bo 查询条件
* @return 同步教材记录列表
*/
List<SysTextbookRecordVo> queryList(SysTextbookRecordBo bo);
}

1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java
View File

@ -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<SysCatalogPerson> list = catalogService.selectList(new LambdaQueryWrapper<SysCatalogPerson>()

37
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTextbookRecordServiceImpl.java
View File

@ -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<SysTextbookRecordVo> queryPageList(SysTextbookRecordBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SysTextbookRecord> lqw = buildQueryWrapper(bo);
Page<SysTextbookRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
public TableDataInfo<SysTextbookRecordVo> queryPageList(Integer recordType, PageQuery pageQuery) {
QueryWrapper<SysTextbookRecord> wrapper = Wrappers.query();
wrapper.eq("tr.record_type", recordType)
.eq("tr.create_by", LoginHelper.getUserId())
.orderByDesc("tr.create_time");
Page<SysTextbookRecordVo> result = baseMapper.selectPageList(pageQuery.build(), wrapper);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的同步教材记录列表
*
* @param bo 查询条件
* @return 同步教材记录列表
*/
@Override
public List<SysTextbookRecordVo> queryList(SysTextbookRecordBo bo) {
LambdaQueryWrapper<SysTextbookRecord> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SysTextbookRecord> buildQueryWrapper(SysTextbookRecordBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysTextbookRecord> lqw = Wrappers.lambdaQuery();
return lqw;
}
}

16
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTextbookRecordMapper.xml
View File

@ -4,7 +4,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.system.mapper.SysTextbookRecordMapper">
<insert id="replaceInto">
replace into
</insert>
<select id="selectPageList" resultType="org.dromara.system.domain.vo.SysTextbookRecordVo">
select tr.create_time,
tr.record_type,
ifnull(ot.file_name, '已失效') as fileName,
ot.id as ossTextbookId,
u.nick_name as createBy,
d.dept_name as createDept
from sys_textbook_record tr
left join sys_oss_textbook ot on ot.id = tr.oss_textbook_id and ot.del_flag = 0
left join sys_user u on u.user_id = ot.create_by
left join sys_dept d on d.dept_id = ot.create_dept
${ew.getCustomSqlSegment}
</select>
</mapper>