From 07b2122871c701d6b78cee16ecff4653e69b23a1 Mon Sep 17 00:00:00 2001 From: cjw Date: Wed, 19 Jun 2024 15:00:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=84=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/file/SysOssPersonController.java | 4 ++++ .../controller/file/SysOssResourceController.java | 5 +++++ .../controller/file/SysOssTextbookController.java | 4 ++++ .../java/org/dromara/system/domain/SysHomeShow.java | 12 ++++++++++-- .../java/org/dromara/system/domain/SysOssPerson.java | 5 +++++ .../org/dromara/system/domain/SysOssResource.java | 5 +++++ .../org/dromara/system/domain/SysOssTextbook.java | 5 +++++ .../org/dromara/system/domain/bo/SysHomeShowBo.java | 6 ++++++ .../org/dromara/system/domain/bo/SysOssPersonBo.java | 5 ++--- .../dromara/system/domain/bo/SysOssResourceBo.java | 5 +++++ .../dromara/system/domain/bo/SysOssTextbookBo.java | 4 ++-- .../org/dromara/system/domain/vo/SysHomeShowVo.java | 5 +++++ .../system/service/impl/SysHomeShowServiceImpl.java | 1 - .../system/service/impl/SysHomeTrendServiceImpl.java | 5 ++--- .../system/service/impl/SysOssPersonServiceImpl.java | 8 +++++++- .../service/impl/SysOssResourceServiceImpl.java | 10 +++++++++- .../service/impl/SysOssTextbookServiceImpl.java | 10 +++++++++- .../resources/mapper/system/SysOssPersonMapper.xml | 2 +- .../resources/mapper/system/SysOssResourceMapper.xml | 4 ++-- .../resources/mapper/system/SysOssTextbookMapper.xml | 4 ++-- 20 files changed, 90 insertions(+), 19 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 14d2576..2936bac 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,6 +128,10 @@ public class SysOssPersonController extends BaseController { return toAjax(sysOssPersonService.moveByBo(bo)); } + /** + * 下载 + * @param id 主键 + */ @SaCheckPermission("file:person:download") @PostMapping("/download/{id}") public void download(@PathVariable Long id, HttpServletResponse response) throws Exception { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java index da0ba86..2d5210f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java @@ -135,6 +135,11 @@ public class SysOssResourceController extends BaseController { public R move(@RequestBody SysOssResourceBo bo) { return toAjax(sysOssResourceService.moveByBo(bo)); } + + /** + * 下载 + * @param id 主键 + */ @SaCheckPermission("file:resource:download") @PostMapping("/download/{id}") public void download(@PathVariable Long id, HttpServletResponse response) throws Exception { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java index 06aceba..4c063ff 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java @@ -138,6 +138,10 @@ public class SysOssTextbookController extends BaseController { return toAjax(sysOssTextbookService.moveByBo(bo)); } + /** + * 下载 + * @param id 主键 + */ @SaCheckPermission("file:textbook:download") @PostMapping("/download/{id}") public void download(@PathVariable Long id, HttpServletResponse response) throws Exception { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeShow.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeShow.java index 837d53e..2a817b1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeShow.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeShow.java @@ -1,9 +1,12 @@ package org.dromara.system.domain; -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; import java.io.Serial; @@ -47,6 +50,11 @@ public class SysHomeShow extends TenantEntity { */ private Long sort; + /** + * 头像 + */ + private Long avatar; + /** * 教师介绍 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssPerson.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssPerson.java index 9fa24a6..ca87c64 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssPerson.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssPerson.java @@ -48,5 +48,10 @@ public class SysOssPerson extends TenantEntity { */ private String filePath; + /** + * 文件后缀名 + */ + private String fileSuffix; + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssResource.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssResource.java index c05d90d..8587c74 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssResource.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssResource.java @@ -40,6 +40,11 @@ public class SysOssResource extends TenantEntity { */ private String filePath; + /** + * 文件后缀名 + */ + private String fileSuffix; + /** * 状态 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssTextbook.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssTextbook.java index 2f5a123..a93ca17 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssTextbook.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssTextbook.java @@ -39,6 +39,11 @@ public class SysOssTextbook extends TenantEntity { */ private String filePath; + /** + * 文件后缀名 + */ + private String fileSuffix; + /** * 1课件，2课堂，3作业，4试卷 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysHomeShowBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysHomeShowBo.java index c9e1415..fb0be48 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysHomeShowBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysHomeShowBo.java @@ -49,6 +49,12 @@ public class SysHomeShowBo extends BaseEntity { @NotNull(message = "排序不能为空", groups = { AddGroup.class, EditGroup.class }) private Long sort; + /** + * 头像 + */ + @NotNull(message = "头像不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long avatar; + /** * 教师介绍 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssPersonBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssPersonBo.java index de11ca1..ec88441 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssPersonBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssPersonBo.java @@ -31,11 +31,10 @@ public class SysOssPersonBo extends BaseEntity { @NotBlank(message = "文件名不能为空", groups = {AddGroup.class, EditGroup.class}) private String fileName; - /** - * 文件路径 + * 文件后缀名 */ - private String filePath; + private String fileSuffix; private Integer status; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssResourceBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssResourceBo.java index 59f49bb..a0ec9c2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssResourceBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssResourceBo.java @@ -33,6 +33,11 @@ public class SysOssResourceBo extends BaseEntity { @NotNull(message = "文件名不能为空", groups = {AddGroup.class, EditGroup.class}) private String fileName; + /** + * 文件后缀名 + */ + private String fileSuffix; + /** * 状态 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java index 288b2f2..4edf61d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java @@ -33,9 +33,9 @@ public class SysOssTextbookBo extends BaseEntity { private String fileName; /** - * 文件路径 + * 文件后缀名 */ - private String filePath; + private String fileSuffix; /** * 1课件，2课堂，3作业，4试卷 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeShowVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeShowVo.java index 5937fa3..7fac037 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeShowVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeShowVo.java @@ -47,6 +47,11 @@ public class SysHomeShowVo implements Serializable { */ private Long sort; + /** + * 头像 + */ + private Long avatar; + /** * 教师介绍 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeShowServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeShowServiceImpl.java index d7f91b2..c9300ad 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeShowServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeShowServiceImpl.java @@ -75,7 +75,6 @@ public class SysHomeShowServiceImpl implements ISysHomeShowService { lqw.like(StringUtils.isNotBlank(bo.getGradeName()), SysHomeShow::getGradeName, bo.getGradeName()); lqw.like(StringUtils.isNotBlank(bo.getSubjectName()), SysHomeShow::getSubjectName, bo.getSubjectName()); lqw.eq(bo.getSort() != null, SysHomeShow::getSort, bo.getSort()); - lqw.eq(StringUtils.isNotBlank(bo.getContent()), SysHomeShow::getContent, bo.getContent()); lqw.eq(bo.getStatus() != null, SysHomeShow::getStatus, bo.getStatus()); return lqw; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeTrendServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeTrendServiceImpl.java index 05da6d7..3349c6b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeTrendServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeTrendServiceImpl.java @@ -72,11 +72,10 @@ public class SysHomeTrendServiceImpl implements ISysHomeTrendService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getType() != null, SysHomeTrend::getType, bo.getType()); - lqw.eq(StringUtils.isNotBlank(bo.getTitle()), SysHomeTrend::getTitle, bo.getTitle()); - lqw.eq(StringUtils.isNotBlank(bo.getUrl()), SysHomeTrend::getUrl, bo.getUrl()); + lqw.like(StringUtils.isNotBlank(bo.getTitle()), SysHomeTrend::getTitle, bo.getTitle()); lqw.eq(bo.getSort() != null, SysHomeTrend::getSort, bo.getSort()); - lqw.eq(StringUtils.isNotBlank(bo.getContent()), SysHomeTrend::getContent, bo.getContent()); lqw.eq(bo.getStatus() != null, SysHomeTrend::getStatus, bo.getStatus()); + lqw.eq(bo.getCreateTime() !=null,SysHomeTrend::getCreateTime,bo.getCreateTime()); return lqw; } 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 ad1e341..6dd48f7 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 @@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.helper.DataBaseHelper; @@ -85,7 +86,9 @@ public class SysOssPersonServiceImpl implements ISysOssPersonService { private Wrapper buildQueryWrapper(SysOssPersonBo bo) { QueryWrapper wrapper = Wrappers.query(); - wrapper.eq("op.create_by", bo.getCreateBy()) + wrapper.eq(ObjectUtil.isNotNull(bo.getCreateBy()),"op.create_by", bo.getCreateBy()) + .eq(StringUtils.isNotEmpty(bo.getFileSuffix()),"op.file_suffix", bo.getFileSuffix()) + .like(StringUtils.isNotEmpty(bo.getFileName()),"op.file_name", bo.getFileName()) .and(ObjectUtil.isNotNull(bo.getCatalogId()), w -> { List list = catalogService.selectList(new LambdaQueryWrapper() .select(SysCatalogPerson::getCatalogId) @@ -107,6 +110,9 @@ public class SysOssPersonServiceImpl implements ISysOssPersonService { public Boolean insertByBo(SysOssPersonBo bo) { SysOssPerson add = MapstructUtils.convert(bo, SysOssPerson.class); validEntityBeforeSave(add); + String fileName = add.getFileName(); + String suffix = StringUtils.substring(fileName, fileName.lastIndexOf("."), fileName.length()); + add.setFileSuffix(suffix); String path = catalogService.selectCatalogNameById(add.getCatalogId()); add.setFilePath(path); boolean flag = baseMapper.insert(add) > 0; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java index 97c72f8..f682354 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java @@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.helper.DataBaseHelper; @@ -75,7 +76,9 @@ public class SysOssResourceServiceImpl implements ISysOssResourceService { @Override public TableDataInfo queryAwaitPageList(SysOssResourceBo bo, PageQuery pageQuery) { QueryWrapper wrapper = Wrappers.query(); - wrapper.le("r.status", 0); + wrapper.le("r.status", 0) + .eq(StringUtils.isNotEmpty(bo.getFileSuffix()),"r.file_suffix", bo.getFileSuffix()) + .like(StringUtils.isNotEmpty(bo.getFileName()),"r.file_name", bo.getFileName()); Page result = baseMapper.selectPageAwaitList(pageQuery.build(), wrapper); return TableDataInfo.build(result); } @@ -94,6 +97,8 @@ public class SysOssResourceServiceImpl implements ISysOssResourceService { private Wrapper buildQueryWrapper(SysOssResourceBo bo) { QueryWrapper wrapper = Wrappers.query(); wrapper.eq(ObjectUtil.isNotNull(bo.getStatus()), "r.status", bo.getStatus()) + .eq(StringUtils.isNotEmpty(bo.getFileSuffix()), "r.file_suffix", bo.getFileSuffix()) + .like(StringUtils.isNotEmpty(bo.getFileName()), "r.file_name", bo.getFileName()) .and(ObjectUtil.isNotNull(bo.getCatalogId()), w -> { List deptList = catalogService.selectList(new LambdaQueryWrapper() .select(SysCatalogResource::getCatalogId) @@ -115,6 +120,9 @@ public class SysOssResourceServiceImpl implements ISysOssResourceService { public Boolean insertByBo(SysOssResourceBo bo) { SysOssResource add = MapstructUtils.convert(bo, SysOssResource.class); validEntityBeforeSave(add); + String fileName = add.getFileName(); + String suffix = StringUtils.substring(fileName, fileName.lastIndexOf("."), fileName.length()); + add.setFileSuffix(suffix); String path = catalogService.selectCatalogNameById(add.getCatalogId()); add.setFilePath(path); add.setStatus(-1); 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 2346f1d..2fff75d 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 @@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.helper.DataBaseHelper; @@ -74,7 +75,9 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { @Override public TableDataInfo queryAwaitPageList(SysOssTextbookBo bo, PageQuery pageQuery) { QueryWrapper wrapper = Wrappers.query(); - wrapper.le("ot.status", 0); + wrapper.le("ot.status", 0) + .eq(StringUtils.isNotEmpty(bo.getFileSuffix()), "ot.file_suffix", bo.getFileSuffix()) + .like(StringUtils.isNotEmpty(bo.getFileName()), "ot.file_name", bo.getFileName()); Page result = baseMapper.selectPageAwaitList(pageQuery.build(), wrapper); return TableDataInfo.build(result); } @@ -94,6 +97,8 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { QueryWrapper wrapper = Wrappers.query(); wrapper.eq(ObjectUtil.isNotNull(bo.getType()), "ot.type", bo.getType()) .eq(ObjectUtil.isNotNull(bo.getStatus()), "ot.status", bo.getStatus()) + .eq(StringUtils.isNotEmpty(bo.getFileSuffix()), "ot.file_suffix", bo.getFileSuffix()) + .like(StringUtils.isNotEmpty(bo.getFileName()), "ot.file_name", bo.getFileName()) .and(ObjectUtil.isNotNull(bo.getCatalogId()), w -> { List list = catalogService.selectList(new LambdaQueryWrapper() .select(SysCatalogTextbook::getCatalogId) @@ -115,6 +120,9 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { public Boolean insertByBo(SysOssTextbookBo bo) { SysOssTextbook add = MapstructUtils.convert(bo, SysOssTextbook.class); validEntityBeforeSave(add); + String fileName = add.getFileName(); + String suffix = StringUtils.substring(fileName, fileName.lastIndexOf("."), fileName.length()); + add.setFileSuffix(suffix); String path = catalogService.selectCatalogNameById(add.getCatalogId()); add.setFilePath(path); add.setStatus(-1); diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssPersonMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssPersonMapper.xml index a755b4a..13b3fa2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssPersonMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssPersonMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select r.*, o.file_suffix, o.volume + select r.*, o.volume from sys_oss_resource r left join sys_oss o on o.oss_id = r.oss_id ${ew.getCustomSqlSegment} - select ot.*, o.file_suffix, o.volume + select ot.*, o.volume from sys_oss_textbook ot left join sys_oss o on o.oss_id = ot.oss_id ${ew.getCustomSqlSegment}