manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔨 添加排序字段.

Browse Source
This commit is contained in:
lijiahangmax
2025-03-19 23:37:13 +08:00
parent 94c0b6a785
commit 2e8a7c40d9
16 changed files with 55 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java
View File

@@ -58,8 +58,9 @@ public class OperatorLogApiImpl implements OperatorLogApi {
LambdaQueryWrapper<OperatorLogDO> wrapper = this.buildQueryWrapper(request);
// 查询
return operatorLogDAO.of()
.page(request)
.wrapper(wrapper)
.page(request)
.order(request, OperatorLogDO::getId)
.dataGrid(OperatorLogProviderConvert.MAPPER::to);
}
@@ -85,8 +86,7 @@ public class OperatorLogApiImpl implements OperatorLogApi {
.eq(OperatorLogDO::getResult, request.getResult())
.like(OperatorLogDO::getExtra, request.getExtra())
.ge(OperatorLogDO::getStartTime, request.getStartTimeStart())
.le(OperatorLogDO::getStartTime, request.getStartTimeEnd())
.orderByDesc(OperatorLogDO::getId);
.le(OperatorLogDO::getStartTime, request.getStartTimeEnd());
}
}

6
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java
View File

@@ -148,8 +148,10 @@ public class DictKeyServiceImpl implements DictKeyService {
// 条件
LambdaQueryWrapper<DictKeyDO> wrapper = this.buildQueryWrapper(request);
// 查询
return dictKeyDAO.of(wrapper)
return dictKeyDAO.of()
.wrapper(wrapper)
.page(request)
.order(request, DictKeyDO::getId)
.dataGrid(DictKeyConvert.MAPPER::to);
}
@@ -264,7 +266,7 @@ public class DictKeyServiceImpl implements DictKeyService {
.and(Strings.isNotEmpty(searchValue), c -> c
.like(DictKeyDO::getKeyName, searchValue).or()
.like(DictKeyDO::getDescription, searchValue)
).orderByDesc(DictKeyDO::getId);
);
}
}

7
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java
View File

@@ -231,8 +231,10 @@ public class DictValueServiceImpl implements DictValueService {
// 条件
LambdaQueryWrapper<DictValueDO> wrapper = this.buildQueryWrapper(request);
// 查询
DataGrid<DictValueVO> dataGrid = dictValueDAO.of(wrapper)
DataGrid<DictValueVO> dataGrid = dictValueDAO.of()
.wrapper(wrapper)
.page(request)
.order(request, DictValueDO::getId)
.dataGrid(DictValueConvert.MAPPER::to);
if (!dataGrid.isEmpty()) {
List<Long> keyIdList = dataGrid.stream()
@@ -408,8 +410,7 @@ public class DictValueServiceImpl implements DictValueService {
.like(DictValueDO::getKeyName, request.getKeyName())
.like(DictValueDO::getValue, request.getValue())
.like(DictValueDO::getLabel, request.getLabel())
.like(DictValueDO::getExtra, request.getExtra())
.orderByDesc(DictValueDO::getId);
.like(DictValueDO::getExtra, request.getExtra());
}
/**

7
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java
View File

@@ -70,8 +70,10 @@ public class HistoryValueServiceImpl implements HistoryValueService {
// 条件
LambdaQueryWrapper<HistoryValueDO> wrapper = this.buildQueryWrapper(request);
// 查询
return historyValueDAO.of(wrapper)
return historyValueDAO.of()
.wrapper(wrapper)
.page(request)
.order(request, HistoryValueDO::getId)
.dataGrid(HistoryValueConvert.MAPPER::to);
}
@@ -121,8 +123,7 @@ public class HistoryValueServiceImpl implements HistoryValueService {
.and(Strings.isNotEmpty(searchValue), c -> c
.like(HistoryValueDO::getBeforeValue, searchValue).or()
.like(HistoryValueDO::getAfterValue, searchValue)
)
.orderByDesc(HistoryValueDO::getId);
);
}
}

7
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java
View File

@@ -71,11 +71,12 @@ public class OperatorLogServiceImpl implements OperatorLogService {
@Override
public DataGrid<OperatorLogVO> getOperatorLogPage(OperatorLogQueryRequest request) {
// 条件
LambdaQueryWrapper<OperatorLogDO> wrapper = this.buildQueryWrapper(request)
.orderByDesc(OperatorLogDO::getId);
LambdaQueryWrapper<OperatorLogDO> wrapper = this.buildQueryWrapper(request);
// 查询
return operatorLogDAO.of(wrapper)
return operatorLogDAO.of()
.wrapper(wrapper)
.page(request)
.order(request, OperatorLogDO::getId)
.dataGrid(OperatorLogConvert.MAPPER::to);
}

4
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java
View File

@@ -176,8 +176,10 @@ public class SystemRoleServiceImpl implements SystemRoleService {
.like(SystemRoleDO::getName, request.getName())
.like(SystemRoleDO::getDescription, request.getDescription());
// 查询
return systemRoleDAO.of(wrapper)
return systemRoleDAO.of()
.wrapper(wrapper)
.page(request)
.order(request, SystemRoleDO::getId)
.dataGrid(SystemRoleConvert.MAPPER::to);
}

3
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java
View File

@@ -230,8 +230,9 @@ public class SystemUserServiceImpl implements SystemUserService {
LambdaQueryWrapper<SystemUserDO> wrapper = this.buildQueryWrapper(request);
// 查询
return systemUserDAO.of()
.page(request)
.wrapper(wrapper)
.page(request)
.order(request, SystemUserDO::getId)
.dataGrid(SystemUserConvert.MAPPER::to);
}