🔨 查询字段.

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;
-
 }

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<Long> hostIdList;
 

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;
+
 }

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<HistoryValueVO> getHistoryValuePage(HistoryValueQueryRequest request) {
         // 条件
-        LambdaQueryWrapper<HistoryValueDO> wrapper = this.buildQueryWrapper(request);
+        LambdaQueryWrapper<HistoryValueDO> wrapper = this.buildQueryWrapper(request)
+                .orderByDesc(HistoryValueDO::getId);
         // 查询
         return historyValueDAO.of()
                 .wrapper(wrapper)
                 .page(request)
-                .order(request, HistoryValueDO::getId)
                 .dataGrid(HistoryValueConvert.MAPPER::to);
     }
 

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<number>;
   hostList: Array<HostQueryResponse>;
 }

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;

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;
 }
 
 /**

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;

orion-visor-ui/src/components/view/card-list/components/card-field-adjust.vue

@@ -14,7 +14,7 @@
       <!-- 顶部按钮 -->
       <div class="table-adjust-popover-header">
         <span class="table-adjust-title">
-          表格展示字段
+          卡片展示字段
         </span>
         <a-button type="text"
                   size="mini"

orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue

@@ -133,12 +133,14 @@
       <!-- 最近执行 -->
       <template #recentLog="{ record }">
         <div class="flex-center" v-if="record.recentLogId && record.recentLogStatus">
+          <!-- 执行时间 -->
+          <span class="mr8">
+            {{ dateFormat(new Date(record.recentLogTime), 'MM-dd HH:mm:ss') }}
+          </span>
           <!-- 执行状态 -->
-          <a-tag class="mr8" :color="getDictValue(execStatusKey, record.recentLogStatus, 'color')">
+          <a-tag :color="getDictValue(execStatusKey, record.recentLogStatus, 'color')">
             {{ getDictValue(execStatusKey, record.recentLogStatus) }}
           </a-tag>
-          <!-- 执行时间 -->
-          {{ dateFormat(new Date(record.recentLogTime), 'MM-dd HH:mm:ss') }}
         </div>
         <!-- 无任务 -->
         <div v-else class="mx8">-</div>