refactor：优化时间范围查询

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/errorcode/ErrorCodeMapper.java

@@ -2,11 +2,10 @@ package cn.iocoder.yudao.module.system.dal.mysql.errorcode;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Collection;
@@ -17,36 +16,36 @@ import java.util.List;
 public interface ErrorCodeMapper extends BaseMapperX<ErrorCodeDO> {
 
     default PageResult<ErrorCodeDO> selectPage(ErrorCodePageReqVO reqVO) {
-        return selectPage(reqVO, new QueryWrapperX<ErrorCodeDO>()
-                .eqIfPresent("type", reqVO.getType())
-                .likeIfPresent("application_name", reqVO.getApplicationName())
-                .eqIfPresent("code", reqVO.getCode())
-                .likeIfPresent("message", reqVO.getMessage())
-                .betweenIfPresent("create_time", reqVO.getCreateTime())
-                .orderByDesc("code"));
+        return selectPage(reqVO, new LambdaQueryWrapperX<ErrorCodeDO>()
+                .eqIfPresent(ErrorCodeDO::getType, reqVO.getType())
+                .likeIfPresent(ErrorCodeDO::getApplicationName, reqVO.getApplicationName())
+                .eqIfPresent(ErrorCodeDO::getCode, reqVO.getCode())
+                .likeIfPresent(ErrorCodeDO::getMessage, reqVO.getMessage())
+                .betweenIfPresent(ErrorCodeDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(ErrorCodeDO::getCode));
     }
 
     default List<ErrorCodeDO> selectList(ErrorCodeExportReqVO reqVO) {
-        return selectList(new QueryWrapperX<ErrorCodeDO>()
-                .eqIfPresent("type", reqVO.getType())
-                .likeIfPresent("application_name", reqVO.getApplicationName())
-                .eqIfPresent("code", reqVO.getCode())
-                .likeIfPresent("message", reqVO.getMessage())
-                .betweenIfPresent("create_time", reqVO.getCreateTime())
-                .orderByAsc("application_name", "code"));
+        return selectList(new LambdaQueryWrapperX<ErrorCodeDO>()
+                .eqIfPresent(ErrorCodeDO::getType, reqVO.getType())
+                .likeIfPresent(ErrorCodeDO::getApplicationName, reqVO.getApplicationName())
+                .eqIfPresent(ErrorCodeDO::getCode, reqVO.getCode())
+                .likeIfPresent(ErrorCodeDO::getMessage, reqVO.getMessage())
+                .betweenIfPresent(ErrorCodeDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(ErrorCodeDO::getCode));
     }
 
     default List<ErrorCodeDO> selectListByCodes(Collection<Integer> codes) {
-        return selectList(new QueryWrapper<ErrorCodeDO>().in("code", codes));
+        return selectList(new LambdaQueryWrapperX<ErrorCodeDO>().in(ErrorCodeDO::getCode, codes));
     }
 
     default ErrorCodeDO selectByCode(Integer code) {
-        return selectOne(new QueryWrapper<ErrorCodeDO>().eq("code", code));
+        return selectOne(new LambdaQueryWrapperX<ErrorCodeDO>().eq(ErrorCodeDO::getCode, code));
     }
 
     default List<ErrorCodeDO> selectListByApplicationNameAndUpdateTimeGt(String applicationName, Date minUpdateTime) {
-        return selectList(new QueryWrapperX<ErrorCodeDO>().eq("application_name", applicationName)
-                .gtIfPresent("update_time", minUpdateTime));
+        return selectList(new LambdaQueryWrapperX<ErrorCodeDO>().eq(ErrorCodeDO::getApplicationName, applicationName)
+                .gtIfPresent(ErrorCodeDO::getUpdateTime, minUpdateTime));
     }
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/logger/LoginLogMapper.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.system.dal.mysql.logger;
 
-import cn.iocoder.yudao.module.system.dal.dataobject.logger.LoginLogDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.logger.LoginLogDO;
 import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -15,30 +15,30 @@ import java.util.List;
 public interface LoginLogMapper extends BaseMapperX<LoginLogDO> {
 
     default PageResult<LoginLogDO> selectPage(LoginLogPageReqVO reqVO) {
-        QueryWrapperX<LoginLogDO> query = new QueryWrapperX<LoginLogDO>()
-                .likeIfPresent("user_ip", reqVO.getUserIp())
-                .likeIfPresent("username", reqVO.getUsername())
-                .betweenIfPresent("create_time", reqVO.getCreateTime());
+        LambdaQueryWrapperX<LoginLogDO> query = new LambdaQueryWrapperX<LoginLogDO>()
+                .likeIfPresent(LoginLogDO::getUserIp, reqVO.getUserIp())
+                .likeIfPresent(LoginLogDO::getUsername, reqVO.getUsername())
+                .betweenIfPresent(LoginLogDO::getCreateTime, reqVO.getCreateTime());
         if (Boolean.TRUE.equals(reqVO.getStatus())) {
-            query.eq("result", LoginResultEnum.SUCCESS.getResult());
+            query.eq(LoginLogDO::getResult, LoginResultEnum.SUCCESS.getResult());
         } else if (Boolean.FALSE.equals(reqVO.getStatus())) {
-            query.gt("result", LoginResultEnum.SUCCESS.getResult());
+            query.gt(LoginLogDO::getResult, LoginResultEnum.SUCCESS.getResult());
         }
-        query.orderByDesc("id"); // 降序
+        query.orderByDesc(LoginLogDO::getId); // 降序
         return selectPage(reqVO, query);
     }
 
     default List<LoginLogDO> selectList(LoginLogExportReqVO reqVO) {
-        QueryWrapperX<LoginLogDO> query = new QueryWrapperX<LoginLogDO>()
-                .likeIfPresent("user_ip", reqVO.getUserIp())
-                .likeIfPresent("username", reqVO.getUsername())
-                .betweenIfPresent("create_time", reqVO.getCreateTime());
+        LambdaQueryWrapperX<LoginLogDO> query = new LambdaQueryWrapperX<LoginLogDO>()
+                .likeIfPresent(LoginLogDO::getUserIp, reqVO.getUserIp())
+                .likeIfPresent(LoginLogDO::getUsername, reqVO.getUsername())
+                .betweenIfPresent(LoginLogDO::getCreateTime, reqVO.getCreateTime());
         if (Boolean.TRUE.equals(reqVO.getStatus())) {
-            query.eq("result", LoginResultEnum.SUCCESS.getResult());
+            query.eq(LoginLogDO::getResult, LoginResultEnum.SUCCESS.getResult());
         } else if (Boolean.FALSE.equals(reqVO.getStatus())) {
-            query.gt("result", LoginResultEnum.SUCCESS.getResult());
+            query.gt(LoginLogDO::getResult, LoginResultEnum.SUCCESS.getResult());
         }
-        query.orderByDesc("id"); // 降序
+        query.orderByDesc(LoginLogDO::getId); // 降序
         return selectList(query);
     }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsLogMapper.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.system.dal.mysql.sms;
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsLogDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -14,27 +14,27 @@ import java.util.List;
 public interface SmsLogMapper extends BaseMapperX<SmsLogDO> {
 
     default PageResult<SmsLogDO> selectPage(SmsLogPageReqVO reqVO) {
-        return selectPage(reqVO, new QueryWrapperX<SmsLogDO>()
-                .eqIfPresent("channel_id", reqVO.getChannelId())
-                .eqIfPresent("template_id", reqVO.getTemplateId())
-                .likeIfPresent("mobile", reqVO.getMobile())
-                .eqIfPresent("send_status", reqVO.getSendStatus())
-                .betweenIfPresent("send_time", reqVO.getSendTime())
-                .eqIfPresent("receive_status", reqVO.getReceiveStatus())
-                .betweenIfPresent("receive_time", reqVO.getReceiveTime())
-                .orderByDesc("id"));
+        return selectPage(reqVO, new LambdaQueryWrapperX<SmsLogDO>()
+                .eqIfPresent(SmsLogDO::getChannelId, reqVO.getChannelId())
+                .eqIfPresent(SmsLogDO::getTemplateId, reqVO.getTemplateId())
+                .likeIfPresent(SmsLogDO::getMobile, reqVO.getMobile())
+                .eqIfPresent(SmsLogDO::getSendStatus, reqVO.getSendStatus())
+                .betweenIfPresent(SmsLogDO::getSendTime, reqVO.getSendTime())
+                .eqIfPresent(SmsLogDO::getSendStatus, reqVO.getReceiveStatus())
+                .betweenIfPresent(SmsLogDO::getReceiveTime, reqVO.getReceiveTime())
+                .orderByDesc(SmsLogDO::getId));
     }
 
     default List<SmsLogDO> selectList(SmsLogExportReqVO reqVO) {
-        return selectList(new QueryWrapperX<SmsLogDO>()
-                .eqIfPresent("channel_id", reqVO.getChannelId())
-                .eqIfPresent("template_id", reqVO.getTemplateId())
-                .likeIfPresent("mobile", reqVO.getMobile())
-                .eqIfPresent("send_status", reqVO.getSendStatus())
-                .betweenIfPresent("send_time", reqVO.getSendTime())
-                .eqIfPresent("receive_status", reqVO.getReceiveStatus())
-                .betweenIfPresent("receive_time", reqVO.getReceiveTime())
-                .orderByDesc("id"));
+        return selectList(new LambdaQueryWrapperX<SmsLogDO>()
+                .eqIfPresent(SmsLogDO::getChannelId, reqVO.getChannelId())
+                .eqIfPresent(SmsLogDO::getTemplateId, reqVO.getTemplateId())
+                .likeIfPresent(SmsLogDO::getMobile, reqVO.getMobile())
+                .eqIfPresent(SmsLogDO::getSendStatus, reqVO.getSendStatus())
+                .betweenIfPresent(SmsLogDO::getSendTime, reqVO.getSendTime())
+                .eqIfPresent(SmsLogDO::getSendStatus, reqVO.getReceiveStatus())
+                .betweenIfPresent(SmsLogDO::getReceiveTime, reqVO.getReceiveTime())
+                .orderByDesc(SmsLogDO::getId));
     }
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java

@@ -1,12 +1,11 @@
 package cn.iocoder.yudao.module.system.dal.mysql.user;
 
-import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserExportReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO;
-import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserExportReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -36,7 +35,6 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
                 .orderByDesc(AdminUserDO::getId));
-
     }
 
     default List<AdminUserDO> selectList(UserExportReqVO reqVO, Collection<Long> deptIds) {
@@ -65,4 +63,3 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
     }
 
 }
-