【8.0.3】【system】更新日志的按字段排序

kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/log/loginlog/service/impl/SysLoginLogServiceImpl.java

@@ -196,8 +196,12 @@ public class SysLoginLogServiceImpl extends ServiceImpl<SysLoginLogMapper, SysLo
         queryWrapper.ge(StrUtil.isNotBlank(sysLoginLogRequest.getBeginTime()), SysLoginLog::getCreateTime, beginDate);
         queryWrapper.le(StrUtil.isNotBlank(sysLoginLogRequest.getEndTime()), SysLoginLog::getCreateTime, endDate);
 
-        // 根据创建时间降序排列
+        // 根据请求参数的顺序排列
-        queryWrapper.orderByDesc(SysLoginLog::getCreateTime);
+        if (ObjectUtil.isNotEmpty(sysLoginLogRequest.getOrderBy()) && ObjectUtil.isNotEmpty(sysLoginLogRequest.getSortBy())) {
+            queryWrapper.last(sysLoginLogRequest.getOrderByLastSql());
+        } else {
+            queryWrapper.orderByDesc(SysLoginLog::getCreateTime);
+        }
 
         return queryWrapper;
     }

kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/service/impl/SysLogServiceImpl.java

@@ -122,8 +122,12 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
     private LambdaQueryWrapper<SysLog> createWrapper(LogManagerRequest logManagerRequest) {
         LambdaQueryWrapper<SysLog> queryWrapper = new LambdaQueryWrapper<>();
 
-        // 根据时间倒序排序
+        // 根据请求参数的顺序排列
-        queryWrapper.orderByDesc(SysLog::getCreateTime);
+        if (ObjectUtil.isNotEmpty(logManagerRequest.getOrderBy()) && ObjectUtil.isNotEmpty(logManagerRequest.getSortBy())) {
+            queryWrapper.last(logManagerRequest.getOrderByLastSql());
+        } else {
+            queryWrapper.orderByDesc(SysLog::getCreateTime);
+        }
 
         if (ObjectUtil.isEmpty(logManagerRequest)) {
             return queryWrapper;

kernel-d-log/log-business/src/main/java/cn/stylefeng/roses/kernel/log/business/service/impl/SysLogBusinessServiceImpl.java

@@ -31,7 +31,8 @@ import java.util.List;
  * @date 2023/07/21 19:02
  */
 @Service
-public class SysLogBusinessServiceImpl extends ServiceImpl<SysLogBusinessMapper, SysLogBusiness> implements SysLogBusinessService, BizLogServiceApi {
+public class SysLogBusinessServiceImpl extends ServiceImpl<SysLogBusinessMapper, SysLogBusiness> implements SysLogBusinessService,
+        BizLogServiceApi {
 
     @Resource
     private SysLogBusinessContentService sysLogBusinessContentService;
@@ -118,16 +119,8 @@ public class SysLogBusinessServiceImpl extends ServiceImpl<SysLogBusinessMapper,
             queryWrapper.in(SysLogBusiness::getLogTypeCode, logTypeCodeList);
         }
 
-        // 根据文本检索内容查询
+        // 填充搜索名称和排序
-        String searchText = sysLogBusinessRequest.getSearchText();
+        this.buildCommonWrapper(sysLogBusinessRequest, queryWrapper);
-        if (ObjectUtil.isNotEmpty(searchText)) {
-            queryWrapper.nested(wrap -> {
-                wrap.like(SysLogBusiness::getLogTitle, searchText).or().like(SysLogBusiness::getRequestUrl, searchText);
-            });
-        }
-
-        // 根据创建时间倒序排列
-        queryWrapper.orderByDesc(SysLogBusiness::getCreateTime);
 
         Page<SysLogBusiness> sysRolePage = this.page(PageFactory.defaultPage(), queryWrapper);
         return PageResultFactory.createPageResult(sysRolePage);
@@ -160,6 +153,19 @@ public class SysLogBusinessServiceImpl extends ServiceImpl<SysLogBusinessMapper,
         String logTypeCode = sysLogBusinessRequest.getLogTypeCode();
         queryWrapper.eq(ObjectUtil.isNotEmpty(logTypeCode), SysLogBusiness::getLogTypeCode, logTypeCode);
 
+        // 填充搜索名称和排序
+        this.buildCommonWrapper(sysLogBusinessRequest, queryWrapper);
+
+        return queryWrapper;
+    }
+
+    /**
+     * 填充搜索名称和排序的条件
+     *
+     * @author fengshuonan
+     * @since 2023/11/13 18:41
+     */
+    private void buildCommonWrapper(SysLogBusinessRequest sysLogBusinessRequest, LambdaQueryWrapper<SysLogBusiness> queryWrapper) {
         // 根据文本检索内容查询
         String searchText = sysLogBusinessRequest.getSearchText();
         if (ObjectUtil.isNotEmpty(searchText)) {
@@ -168,9 +174,12 @@ public class SysLogBusinessServiceImpl extends ServiceImpl<SysLogBusinessMapper,
             });
         }
 
-        // 根据创建时间倒序排列
+        // 根据请求参数的顺序排列
-        queryWrapper.orderByDesc(SysLogBusiness::getCreateTime);
+        if (ObjectUtil.isNotEmpty(sysLogBusinessRequest.getOrderBy()) && ObjectUtil.isNotEmpty(sysLogBusinessRequest.getSortBy())) {
-
+            queryWrapper.last(sysLogBusinessRequest.getOrderByLastSql());
-        return queryWrapper;
+        } else {
+            queryWrapper.orderByDesc(SysLogBusiness::getCreateTime);
+        }
     }
+
 }