diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobHostVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobHostVO.java index a0d86b2a..55d93b36 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobHostVO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobHostVO.java @@ -29,7 +29,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; -import java.util.Date; /** * 计划任务主机 视图响应对象 @@ -56,16 +55,4 @@ public class ExecJobHostVO implements Serializable { @Schema(description = "主机id") private Long hostId; - @Schema(description = "创建时间") - private Date createTime; - - @Schema(description = "修改时间") - private Date updateTime; - - @Schema(description = "创建人") - private String creator; - - @Schema(description = "修改人") - private String updater; - } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobVO.java index 87cf9ce0..7108aa44 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobVO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobVO.java @@ -93,6 +93,12 @@ public class ExecJobVO implements Serializable { @Schema(description = "修改时间") private Date updateTime; + @Schema(description = "创建人") + private String creator; + + @Schema(description = "修改人") + private String updater; + @Schema(description = "执行主机") private List hostIdList; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictKeyVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictKeyVO.java index 364027fa..1bd5de87 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictKeyVO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictKeyVO.java @@ -29,6 +29,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.Date; /** * 字典配置项 视图响应对象 @@ -61,4 +62,16 @@ public class DictKeyVO implements Serializable { @Schema(description = "配置描述") private String description; + @Schema(description = "创建时间") + private Date createTime; + + @Schema(description = "修改时间") + private Date updateTime; + + @Schema(description = "创建人") + private String creator; + + @Schema(description = "修改人") + private String updater; + } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java index f036f271..45f32664 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java @@ -68,12 +68,12 @@ public class HistoryValueServiceImpl implements HistoryValueService { @Override public DataGrid getHistoryValuePage(HistoryValueQueryRequest request) { // 条件 - LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); + LambdaQueryWrapper wrapper = this.buildQueryWrapper(request) + .orderByDesc(HistoryValueDO::getId); // 查询 return historyValueDAO.of() .wrapper(wrapper) .page(request) - .order(request, HistoryValueDO::getId) .dataGrid(HistoryValueConvert.MAPPER::to); } diff --git a/orion-visor-ui/src/api/exec/exec-job.ts b/orion-visor-ui/src/api/exec/exec-job.ts index 8a7402ac..b65b0529 100644 --- a/orion-visor-ui/src/api/exec/exec-job.ts +++ b/orion-visor-ui/src/api/exec/exec-job.ts @@ -71,6 +71,8 @@ export interface ExecJobQueryResponse extends TableData { execUsername: string; createTime: number; updateTime: number; + creator: string; + updater: string; hostIdList: Array; hostList: Array; } diff --git a/orion-visor-ui/src/api/meta/history-value.ts b/orion-visor-ui/src/api/meta/history-value.ts index 45e4b0ad..df3bde3a 100644 --- a/orion-visor-ui/src/api/meta/history-value.ts +++ b/orion-visor-ui/src/api/meta/history-value.ts @@ -1,11 +1,11 @@ -import type { DataGrid, OrderDirection, Pagination } from '@/types/global'; +import type { DataGrid, Pagination } from '@/types/global'; import type { TableData } from '@arco-design/web-vue'; import axios from 'axios'; /** * 历史归档查询请求 */ -export interface HistoryValueQueryRequest extends Pagination, OrderDirection { +export interface HistoryValueQueryRequest extends Pagination { searchValue?: string; relId?: number; type?: string; diff --git a/orion-visor-ui/src/api/system/dict-key.ts b/orion-visor-ui/src/api/system/dict-key.ts index 9eb1099a..b9180c69 100644 --- a/orion-visor-ui/src/api/system/dict-key.ts +++ b/orion-visor-ui/src/api/system/dict-key.ts @@ -39,6 +39,10 @@ export interface DictKeyQueryResponse extends TableData { valueType: string; extraSchema: string; description: string; + createTime: number; + updateTime: number; + creator: string; + updater: string; } /** diff --git a/orion-visor-ui/src/api/system/message.ts b/orion-visor-ui/src/api/system/message.ts index a845b9d3..8069f848 100644 --- a/orion-visor-ui/src/api/system/message.ts +++ b/orion-visor-ui/src/api/system/message.ts @@ -1,10 +1,10 @@ -import type { OrderDirection, Pagination } from '@/types/global'; +import type { Pagination } from '@/types/global'; import axios from 'axios'; /** * 系统消息查询请求 */ -export interface MessageQueryRequest extends Pagination, OrderDirection { +export interface MessageQueryRequest extends Pagination { maxId?: number; classify?: string; queryUnread?: boolean; diff --git a/orion-visor-ui/src/components/view/card-list/components/card-field-adjust.vue b/orion-visor-ui/src/components/view/card-list/components/card-field-adjust.vue index 1ddde24c..aed7f01f 100644 --- a/orion-visor-ui/src/components/view/card-list/components/card-field-adjust.vue +++ b/orion-visor-ui/src/components/view/card-list/components/card-field-adjust.vue @@ -14,7 +14,7 @@
- 表格展示字段 + 卡片展示字段