From 03c44645c5afbb8363fead43085ee3af7b053508 Mon Sep 17 00:00:00 2001 From: cjw Date: Wed, 3 Jul 2024 10:46:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/system/mapper/SysOssVolumeMapper.java | 4 +++- .../system/service/impl/SysOssResourceServiceImpl.java | 9 ++++----- .../system/service/impl/SysOssTextbookServiceImpl.java | 10 +++++----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssVolumeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssVolumeMapper.java index 9ebb87e..b444e11 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssVolumeMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssVolumeMapper.java @@ -1,9 +1,10 @@ package org.dromara.system.mapper; +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.SysOssVolume; import org.dromara.system.domain.vo.SysOssVolumeVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** * 资源容量Mapper接口 @@ -11,6 +12,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author cjw * @date 2024-06-25 */ +@Mapper public interface SysOssVolumeMapper extends BaseMapperPlus { int increaseUse(@Param("id") Long id, @Param("use")Long use); 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 c697005..7727d61 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 @@ -84,11 +84,10 @@ public class SysOssResourceServiceImpl implements ISysOssResourceService { @Override public Long countAwaitList(SysOssResourceBo bo) { - QueryWrapper wrapper = Wrappers.query(); - - wrapper.eq("r.status", -1) - .eq(StringUtils.isNotEmpty(bo.getFileSuffix()), "r.file_suffix", bo.getFileSuffix()) - .like(StringUtils.isNotEmpty(bo.getFileName()), "r.file_name", bo.getFileName()); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(SysOssResource::getStatus, -1) + .eq(StringUtils.isNotEmpty(bo.getFileSuffix()), SysOssResource::getFileSuffix, bo.getFileSuffix()) + .like(StringUtils.isNotEmpty(bo.getFileName()), SysOssResource::getFileName, bo.getFileName()); return baseMapper.selectCount(wrapper); } 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 bd07d2b..4f95e5e 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 @@ -2,6 +2,7 @@ package org.dromara.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +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; @@ -90,11 +91,10 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { @Override public Long countAwaitList(SysOssTextbookBo bo) { - QueryWrapper wrapper = Wrappers.query(); - - wrapper.eq("ot.status", -1) - .eq(StringUtils.isNotEmpty(bo.getFileSuffix()), "ot.file_suffix", bo.getFileSuffix()) - .like(StringUtils.isNotEmpty(bo.getFileName()), "ot.file_name", bo.getFileName()); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(SysOssTextbook::getStatus, -1) + .eq(StringUtils.isNotEmpty(bo.getFileSuffix()), SysOssTextbook::getFileSuffix, bo.getFileSuffix()) + .like(StringUtils.isNotEmpty(bo.getFileName()), SysOssTextbook::getFileName, bo.getFileName()); return baseMapper.selectCount(wrapper); }