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

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

@@ -246,8 +246,10 @@ public class ExecJobServiceImpl implements ExecJobService {
// 条件 // 条件
LambdaQueryWrapper<ExecJobDO> wrapper = this.buildQueryWrapper(request); LambdaQueryWrapper<ExecJobDO> wrapper = this.buildQueryWrapper(request);
// 查询任务 // 查询任务
DataGrid<ExecJobVO> dataGrid = execJobDAO.of(wrapper) DataGrid<ExecJobVO> dataGrid = execJobDAO.of()
.wrapper(wrapper)
.page(request) .page(request)
.order(request, ExecJobDO::getId)
.dataGrid(ExecJobConvert.MAPPER::to); .dataGrid(ExecJobConvert.MAPPER::to);
if (!Booleans.isTrue(request.getQueryRecentLog())) { if (!Booleans.isTrue(request.getQueryRecentLog())) {
return dataGrid; return dataGrid;
@@ -409,8 +411,7 @@ public class ExecJobServiceImpl implements ExecJobService {
.like(ExecJobDO::getName, request.getName()) .like(ExecJobDO::getName, request.getName())
.like(ExecJobDO::getCommand, request.getCommand()) .like(ExecJobDO::getCommand, request.getCommand())
.eq(ExecJobDO::getStatus, request.getStatus()) .eq(ExecJobDO::getStatus, request.getStatus())
.eq(ExecJobDO::getExecUserId, request.getExecUserId()) .eq(ExecJobDO::getExecUserId, request.getExecUserId());
.orderByDesc(ExecJobDO::getId);
} }
/** /**

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

@@ -109,11 +109,12 @@ public class ExecLogServiceImpl implements ExecLogService {
@Override @Override
public DataGrid<ExecLogVO> getExecLogPage(ExecLogQueryRequest request) { public DataGrid<ExecLogVO> getExecLogPage(ExecLogQueryRequest request) {
// 条件 // 条件
LambdaQueryWrapper<ExecLogDO> wrapper = this.buildQueryWrapper(request) LambdaQueryWrapper<ExecLogDO> wrapper = this.buildQueryWrapper(request);
.orderByDesc(ExecLogDO::getId);
// 查询 // 查询
return execLogDAO.of(wrapper) return execLogDAO.of()
.wrapper(wrapper)
.page(request) .page(request)
.order(request, ExecLogDO::getId)
.dataGrid(ExecLogConvert.MAPPER::to); .dataGrid(ExecLogConvert.MAPPER::to);
} }

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

@@ -146,8 +146,10 @@ public class ExecTemplateServiceImpl implements ExecTemplateService {
// 条件 // 条件
LambdaQueryWrapper<ExecTemplateDO> wrapper = this.buildQueryWrapper(request); LambdaQueryWrapper<ExecTemplateDO> wrapper = this.buildQueryWrapper(request);
// 查询模板 // 查询模板
return execTemplateDAO.of(wrapper) return execTemplateDAO.of()
.wrapper(wrapper)
.page(request) .page(request)
.order(request, ExecTemplateDO::getId)
.dataGrid(ExecTemplateConvert.MAPPER::to); .dataGrid(ExecTemplateConvert.MAPPER::to);
} }
@@ -204,8 +206,7 @@ public class ExecTemplateServiceImpl implements ExecTemplateService {
return execTemplateDAO.wrapper() return execTemplateDAO.wrapper()
.eq(ExecTemplateDO::getId, request.getId()) .eq(ExecTemplateDO::getId, request.getId())
.like(ExecTemplateDO::getName, request.getName()) .like(ExecTemplateDO::getName, request.getName())
.like(ExecTemplateDO::getCommand, request.getCommand()) .like(ExecTemplateDO::getCommand, request.getCommand());
.orderByDesc(ExecTemplateDO::getId);
} }
} }

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

@@ -182,8 +182,10 @@ public class HostIdentityServiceImpl implements HostIdentityService {
// 条件 // 条件
LambdaQueryWrapper<HostIdentityDO> wrapper = this.buildQueryWrapper(request); LambdaQueryWrapper<HostIdentityDO> wrapper = this.buildQueryWrapper(request);
// 查询 // 查询
DataGrid<HostIdentityVO> dataGrid = hostIdentityDAO.of(wrapper) DataGrid<HostIdentityVO> dataGrid = hostIdentityDAO.of()
.wrapper(wrapper)
.page(request) .page(request)
.order(request, HostIdentityDO::getId)
.dataGrid(HostIdentityConvert.MAPPER::to); .dataGrid(HostIdentityConvert.MAPPER::to);
if (dataGrid.isEmpty()) { if (dataGrid.isEmpty()) {
return dataGrid; return dataGrid;

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

@@ -185,8 +185,10 @@ public class HostKeyServiceImpl implements HostKeyService {
// 条件 // 条件
LambdaQueryWrapper<HostKeyDO> wrapper = this.buildQueryWrapper(request); LambdaQueryWrapper<HostKeyDO> wrapper = this.buildQueryWrapper(request);
// 查询 // 查询
DataGrid<HostKeyVO> dataGrid = hostKeyDAO.of(wrapper) DataGrid<HostKeyVO> dataGrid = hostKeyDAO.of()
.wrapper(wrapper)
.page(request) .page(request)
.order(request, HostKeyDO::getId)
.dataGrid(HostKeyConvert.MAPPER::to); .dataGrid(HostKeyConvert.MAPPER::to);
dataGrid.forEach(this::toSafe); dataGrid.forEach(this::toSafe);
return dataGrid; return dataGrid;

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

@@ -281,11 +281,12 @@ public class HostServiceImpl implements HostService {
// 数量条件 // 数量条件
LambdaQueryWrapper<HostDO> countWrapper = wrapper.clone(); LambdaQueryWrapper<HostDO> countWrapper = wrapper.clone();
// 基础条件 // 基础条件
wrapper.select(HostDAO.BASE_COLUMN) wrapper.select(HostDAO.BASE_COLUMN);
.orderByAsc(HostDO::getId);
// 查询 // 查询
DataGrid<HostVO> hosts = hostDAO.of(wrapper) DataGrid<HostVO> hosts = hostDAO.of()
.wrapper(wrapper)
.page(request) .page(request)
.order(request, HostDO::getId)
.dataGrid(countWrapper, HostConvert.MAPPER::to); .dataGrid(countWrapper, HostConvert.MAPPER::to);
// 查询拓展信息 // 查询拓展信息
this.setExtraInfo(request, hosts.getRows()); this.setExtraInfo(request, hosts.getRows());

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

@@ -92,11 +92,12 @@ public class TerminalConnectLogServiceImpl implements TerminalConnectLogService
@Override @Override
public DataGrid<TerminalConnectLogVO> getTerminalConnectLogPage(TerminalConnectLogQueryRequest request) { public DataGrid<TerminalConnectLogVO> getTerminalConnectLogPage(TerminalConnectLogQueryRequest request) {
// 条件 // 条件
LambdaQueryWrapper<TerminalConnectLogDO> wrapper = this.buildQueryWrapper(request) LambdaQueryWrapper<TerminalConnectLogDO> wrapper = this.buildQueryWrapper(request);
.orderByDesc(TerminalConnectLogDO::getId);
// 查询 // 查询
return terminalConnectLogDAO.of(wrapper) return terminalConnectLogDAO.of()
.wrapper(wrapper)
.page(request) .page(request)
.order(request, TerminalConnectLogDO::getId)
.dataGrid(s -> { .dataGrid(s -> {
TerminalConnectLogVO vo = TerminalConnectLogConvert.MAPPER.to(s); TerminalConnectLogVO vo = TerminalConnectLogConvert.MAPPER.to(s);
vo.setExtra(JSON.parseObject(s.getExtraInfo(), TerminalConnectLogExtraDTO.class)); vo.setExtra(JSON.parseObject(s.getExtraInfo(), TerminalConnectLogExtraDTO.class));

1
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java
View File

@@ -225,6 +225,7 @@ public class TerminalSftpServiceImpl implements TerminalSftpService {
.build(); .build();
query.setPage(request.getPage()); query.setPage(request.getPage());
query.setLimit(request.getLimit()); query.setLimit(request.getLimit());
query.setOrder(request.getOrder());
if (Strings.isBlank(type)) { if (Strings.isBlank(type)) {
// 查询全部 SFTP 类型 // 查询全部 SFTP 类型
query.setTypeList(TerminalOperatorType.SFTP_TYPES); query.setTypeList(TerminalOperatorType.SFTP_TYPES);

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

@@ -190,11 +190,12 @@ public class UploadTaskServiceImpl implements UploadTaskService {
@Override @Override
public DataGrid<UploadTaskVO> getUploadTaskPage(UploadTaskQueryRequest request) { public DataGrid<UploadTaskVO> getUploadTaskPage(UploadTaskQueryRequest request) {
// 条件 // 条件
LambdaQueryWrapper<UploadTaskDO> wrapper = this.buildQueryWrapper(request) LambdaQueryWrapper<UploadTaskDO> wrapper = this.buildQueryWrapper(request);
.orderByDesc(UploadTaskDO::getId);
// 查询 // 查询
return uploadTaskDAO.of(wrapper) return uploadTaskDAO.of()
.wrapper(wrapper)
.page(request) .page(request)
.order(request, UploadTaskDO::getId)
.dataGrid(UploadTaskConvert.MAPPER::to); .dataGrid(UploadTaskConvert.MAPPER::to);
} }

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

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); LambdaQueryWrapper<DictKeyDO> wrapper = this.buildQueryWrapper(request);
// 查询 // 查询
return dictKeyDAO.of(wrapper) return dictKeyDAO.of()
.wrapper(wrapper)
.page(request) .page(request)
.order(request, DictKeyDO::getId)
.dataGrid(DictKeyConvert.MAPPER::to); .dataGrid(DictKeyConvert.MAPPER::to);
} }
@@ -264,7 +266,7 @@ public class DictKeyServiceImpl implements DictKeyService {
.and(Strings.isNotEmpty(searchValue), c -> c .and(Strings.isNotEmpty(searchValue), c -> c
.like(DictKeyDO::getKeyName, searchValue).or() .like(DictKeyDO::getKeyName, searchValue).or()
.like(DictKeyDO::getDescription, searchValue) .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); LambdaQueryWrapper<DictValueDO> wrapper = this.buildQueryWrapper(request);
// 查询 // 查询
DataGrid<DictValueVO> dataGrid = dictValueDAO.of(wrapper) DataGrid<DictValueVO> dataGrid = dictValueDAO.of()
.wrapper(wrapper)
.page(request) .page(request)
.order(request, DictValueDO::getId)
.dataGrid(DictValueConvert.MAPPER::to); .dataGrid(DictValueConvert.MAPPER::to);
if (!dataGrid.isEmpty()) { if (!dataGrid.isEmpty()) {
List<Long> keyIdList = dataGrid.stream() List<Long> keyIdList = dataGrid.stream()
@@ -408,8 +410,7 @@ public class DictValueServiceImpl implements DictValueService {
.like(DictValueDO::getKeyName, request.getKeyName()) .like(DictValueDO::getKeyName, request.getKeyName())
.like(DictValueDO::getValue, request.getValue()) .like(DictValueDO::getValue, request.getValue())
.like(DictValueDO::getLabel, request.getLabel()) .like(DictValueDO::getLabel, request.getLabel())
.like(DictValueDO::getExtra, request.getExtra()) .like(DictValueDO::getExtra, request.getExtra());
.orderByDesc(DictValueDO::getId);
} }
/** /**

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); LambdaQueryWrapper<HistoryValueDO> wrapper = this.buildQueryWrapper(request);
// 查询 // 查询
return historyValueDAO.of(wrapper) return historyValueDAO.of()
.wrapper(wrapper)
.page(request) .page(request)
.order(request, HistoryValueDO::getId)
.dataGrid(HistoryValueConvert.MAPPER::to); .dataGrid(HistoryValueConvert.MAPPER::to);
} }
@@ -121,8 +123,7 @@ public class HistoryValueServiceImpl implements HistoryValueService {
.and(Strings.isNotEmpty(searchValue), c -> c .and(Strings.isNotEmpty(searchValue), c -> c
.like(HistoryValueDO::getBeforeValue, searchValue).or() .like(HistoryValueDO::getBeforeValue, searchValue).or()
.like(HistoryValueDO::getAfterValue, searchValue) .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 @Override
public DataGrid<OperatorLogVO> getOperatorLogPage(OperatorLogQueryRequest request) { public DataGrid<OperatorLogVO> getOperatorLogPage(OperatorLogQueryRequest request) {
// 条件 // 条件
LambdaQueryWrapper<OperatorLogDO> wrapper = this.buildQueryWrapper(request) LambdaQueryWrapper<OperatorLogDO> wrapper = this.buildQueryWrapper(request);
.orderByDesc(OperatorLogDO::getId);
// 查询 // 查询
return operatorLogDAO.of(wrapper) return operatorLogDAO.of()
.wrapper(wrapper)
.page(request) .page(request)
.order(request, OperatorLogDO::getId)
.dataGrid(OperatorLogConvert.MAPPER::to); .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::getName, request.getName())
.like(SystemRoleDO::getDescription, request.getDescription()); .like(SystemRoleDO::getDescription, request.getDescription());
// 查询 // 查询
return systemRoleDAO.of(wrapper) return systemRoleDAO.of()
.wrapper(wrapper)
.page(request) .page(request)
.order(request, SystemRoleDO::getId)
.dataGrid(SystemRoleConvert.MAPPER::to); .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); LambdaQueryWrapper<SystemUserDO> wrapper = this.buildQueryWrapper(request);
// 查询 // 查询
return systemUserDAO.of() return systemUserDAO.of()
.page(request)
.wrapper(wrapper) .wrapper(wrapper)
.page(request)
.order(request, SystemUserDO::getId)
.dataGrid(SystemUserConvert.MAPPER::to); .dataGrid(SystemUserConvert.MAPPER::to);
} }