From e9285a11e0cbcc3b974d255d1f463f62db677376 Mon Sep 17 00:00:00 2001 From: cjw Date: Fri, 21 Jun 2024 11:31:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=B5=84=E6=BA=90=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/system/domain/SysOssResource.java | 3 +++ .../org/dromara/system/domain/SysOssTextbook.java | 3 +++ .../system/domain/vo/SysOssResourceVo.java | 1 + .../system/domain/vo/SysOssTextbookVo.java | 1 + .../service/impl/SysOssTextbookServiceImpl.java | 15 ++++++++++++++- 5 files changed, 22 insertions(+), 1 deletion(-) 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 8587c74..3dcd4ac 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 @@ -50,5 +50,8 @@ public class SysOssResource extends TenantEntity { */ private Integer status; + private Long downloadNum; + private Long previewNum; + } 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 a93ca17..0d537cf 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 @@ -54,4 +54,7 @@ public class SysOssTextbook extends TenantEntity { */ private Integer status; + private Long downloadNum; + private Long previewNum; + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssResourceVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssResourceVo.java index fa21058..62b47ee 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssResourceVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssResourceVo.java @@ -56,6 +56,7 @@ public class SysOssResourceVo implements Serializable { private Integer status; private Long downloadNum; + private Long previewNum; /** * 容量 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 c4a410d..3b662ce 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 @@ -63,6 +63,7 @@ public class SysOssTextbookVo implements Serializable { private Integer status; private Long downloadNum; + private Long previewNum; /** * 容量 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 4b88e11..cdf8ed2 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 @@ -107,7 +107,20 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { List ids = StreamUtils.toList(list, SysCatalogTextbook::getCatalogId); ids.add(bo.getCatalogId()); w.in("ot.catalog_id", ids); - }).orderByDesc("ot.create_time"); + }); + if (ObjectUtil.isNotNull(bo.getParams().get("downloadDesc"))) { + wrapper.orderByDesc("ot.download_num"); + } else if (ObjectUtil.isNotNull(bo.getParams().get("downloadAsc"))) { + wrapper.orderByAsc("ot.download_num"); + } else if (ObjectUtil.isNotNull(bo.getParams().get("previewDesc"))) { + wrapper.orderByDesc("ot.preview_num"); + } else if (ObjectUtil.isNotNull(bo.getParams().get("previewAsc"))) { + wrapper.orderByAsc("ot.preview_num"); + } else if (ObjectUtil.isNotNull(bo.getParams().get("timeAsc"))) { + wrapper.orderByAsc("ot.create_time"); + } else { + wrapper.orderByDesc("ot.create_time"); + } return wrapper; }