diff --git a/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlMetaData.java b/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlMetaData.java index 398858f2..38d8b034 100644 --- a/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlMetaData.java +++ b/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlMetaData.java @@ -253,7 +253,12 @@ public class MysqlMetaData extends DefaultMetaService implements MetaData { tableIndexColumn.setCollation(resultSet.getString("Collation")); tableIndexColumn.setCardinality(resultSet.getLong("Cardinality")); tableIndexColumn.setSubPart(resultSet.getLong("Sub_part")); - tableIndexColumn.setAscOrDesc(resultSet.getString("Collation")); + String collation = resultSet.getString("Collation"); + if ("a".equalsIgnoreCase(collation)) { + tableIndexColumn.setAscOrDesc("ASC"); + } else if ("d".equalsIgnoreCase(collation)) { + tableIndexColumn.setAscOrDesc("DESC"); + } return tableIndexColumn; } diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/OperationLogServiceImpl.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/OperationLogServiceImpl.java index f14c0857..2b4024f2 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/OperationLogServiceImpl.java +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/OperationLogServiceImpl.java @@ -1,6 +1,7 @@ package ai.chat2db.server.domain.core.impl; import java.time.LocalDateTime; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -22,7 +23,9 @@ import ai.chat2db.server.tools.common.model.EasyLambdaQueryWrapper; import ai.chat2db.server.tools.common.util.ContextUtils; import ai.chat2db.server.tools.common.util.EasySqlUtils; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -67,6 +70,7 @@ public class OperationLogServiceImpl implements OperationLogService { Integer offset = param.getPageSize(); Page page = new Page<>(start, offset); page.setOptimizeCountSql(false); + page.setOrders(Arrays.asList(OrderItem.desc("gmt_create"))); IPage executedDdlDOIPage = operationLogMapper.selectPage(page, queryWrapper); List executedDdlDTOS = operationLogConverter.do2dto(executedDdlDOIPage.getRecords()); if (CollectionUtils.isEmpty(executedDdlDTOS)) {