From 049d1027924ce7f87b62e8062ee9075bec3b8862 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Sat, 11 May 2024 10:54:15 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E8=AF=A6=E6=83=85.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UploadTaskServiceImpl.java   |  2 +-
 .../batch-upload/components/upload-panel.vue  | 32 +++++++++++++++++--
 .../src/views/exec/batch-upload/index.vue     | 16 ++++++++--
 .../exec/exec-command-log-view/index.vue      |  6 ++--
 .../components/upload-task-table.vue          |  4 +--
 .../src/views/exec/upload-task/index.vue      |  4 +--
 .../src/views/job/exec-job-log-view/index.vue |  6 ++--
 7 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/UploadTaskServiceImpl.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/UploadTaskServiceImpl.java
index ea524cca..6082c211 100644
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/UploadTaskServiceImpl.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/UploadTaskServiceImpl.java
@@ -467,7 +467,7 @@ public class UploadTaskServiceImpl implements UploadTaskService {
                         .code(s.getCode())
                         .name(s.getName())
                         .address(s.getAddress())
-                        .files(hostFiles.get(s.getId()))
+                        .files(hostFiles.getOrDefault(s.getId(), Lists.empty()))
                         .build())
                 .collect(Collectors.toList());
         task.setHosts(hosts);
diff --git a/orion-ops-ui/src/views/exec/batch-upload/components/upload-panel.vue b/orion-ops-ui/src/views/exec/batch-upload/components/upload-panel.vue
index cfc76d85..733a1ec0 100644
--- a/orion-ops-ui/src/views/exec/batch-upload/components/upload-panel.vue
+++ b/orion-ops-ui/src/views/exec/batch-upload/components/upload-panel.vue
@@ -86,6 +86,33 @@
   const filesRef = ref();
   const hostModal = ref();
 
+  // 打开日志
+  const openLog = async (id: number) => {
+    setLoading(true);
+    taskId.value = id;
+    taskStatus.value = UploadTaskStepStatus.WAITING;
+    try {
+      // 查询任务
+      const { data } = await getUploadTask(id);
+      task.value = data;
+      selectedHost.value = data.hosts[0].id;
+      // 设置任务状态
+      if (data.status === UploadTaskStatus.FINISHED
+        || data.status === UploadTaskStatus.CANCELED) {
+        taskStatus.value = UploadTaskStepStatus.FINISHED;
+      } else if (data.status === UploadTaskStatus.FAILED) {
+        taskStatus.value = UploadTaskStepStatus.FAILED;
+      } else {
+        taskStatus.value = UploadTaskStepStatus.UPLOADING;
+      }
+    } catch (e) {
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  defineExpose({ openLog });
+
   // 设置选中主机
   const setSelectedHost = (hosts: Array<number>) => {
     formModel.value.hostIdList = hosts;
@@ -196,9 +223,8 @@
     }
     const taskStatusData = data[0];
     // 设置任务状态
-    if (taskStatusData.status === UploadTaskStatus.FINISHED) {
-      taskStatus.value = UploadTaskStepStatus.FINISHED;
-    } else if (taskStatusData.status === UploadTaskStatus.CANCELED) {
+    if (taskStatusData.status === UploadTaskStatus.FINISHED
+      || taskStatusData.status === UploadTaskStatus.CANCELED) {
       taskStatus.value = UploadTaskStepStatus.FINISHED;
     } else if (taskStatusData.status === UploadTaskStatus.FAILED) {
       taskStatus.value = UploadTaskStepStatus.FAILED;
diff --git a/orion-ops-ui/src/views/exec/batch-upload/index.vue b/orion-ops-ui/src/views/exec/batch-upload/index.vue
index 3301ce72..ec372558 100644
--- a/orion-ops-ui/src/views/exec/batch-upload/index.vue
+++ b/orion-ops-ui/src/views/exec/batch-upload/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="layout-container upload-container">
     <!-- 上传面板 -->
-    <upload-panel />
+    <upload-panel ref="panel" />
   </div>
 </template>
 
@@ -12,17 +12,29 @@
 </script>
 
 <script lang="ts" setup>
-  import { onMounted } from 'vue';
+  import { ref, onMounted } from 'vue';
   import { useDictStore } from '@/store';
   import { dictKeys } from './types/const';
+  import { useRoute } from 'vue-router';
   import UploadPanel from './components/upload-panel.vue';
 
+  const route = useRoute();
+
+  const panel = ref();
+
   // 加载字典值
   onMounted(async () => {
     const dictStore = useDictStore();
     await dictStore.loadKeys(dictKeys);
   });
 
+  onMounted(async () => {
+    const idParam = route.query.id;
+    if (idParam) {
+      await panel.value?.openLog(Number.parseInt(idParam as string));
+    }
+  });
+
 </script>
 
 <style lang="less" scoped>
diff --git a/orion-ops-ui/src/views/exec/exec-command-log-view/index.vue b/orion-ops-ui/src/views/exec/exec-command-log-view/index.vue
index 01583e0d..6e49ef8b 100644
--- a/orion-ops-ui/src/views/exec/exec-command-log-view/index.vue
+++ b/orion-ops-ui/src/views/exec/exec-command-log-view/index.vue
@@ -36,9 +36,9 @@
   };
 
   onMounted(() => {
-    const isParam = route.query.id;
-    if (isParam) {
-      init(Number.parseInt(isParam as string));
+    const idParam = route.query.id;
+    if (idParam) {
+      init(Number.parseInt(idParam as string));
     }
   });
 
diff --git a/orion-ops-ui/src/views/exec/upload-task/components/upload-task-table.vue b/orion-ops-ui/src/views/exec/upload-task/components/upload-task-table.vue
index 7877fff9..8bda1598 100644
--- a/orion-ops-ui/src/views/exec/upload-task/components/upload-task-table.vue
+++ b/orion-ops-ui/src/views/exec/upload-task/components/upload-task-table.vue
@@ -140,7 +140,7 @@
           <a-button v-permission="['asset:upload-task:query']"
                     type="text"
                     size="mini"
-                    @click="emits('openDetail', record.id)">
+                    @click="$router.push({ name: 'batchUpload', query: { id: record.id } })">
             详情
           </a-button>
           <!-- 取消 -->
@@ -192,7 +192,7 @@
   import { copy } from '@/hooks/copy';
   import UserSelector from '@/components/user/user/selector/index.vue';
 
-  const emits = defineEmits(['openClear', 'openDetail']);
+  const emits = defineEmits(['openClear']);
 
   const pagination = usePagination();
   const rowSelection = useRowSelection();
diff --git a/orion-ops-ui/src/views/exec/upload-task/index.vue b/orion-ops-ui/src/views/exec/upload-task/index.vue
index f7a94445..66dd7640 100644
--- a/orion-ops-ui/src/views/exec/upload-task/index.vue
+++ b/orion-ops-ui/src/views/exec/upload-task/index.vue
@@ -2,8 +2,7 @@
   <div class="layout-container" v-if="render">
     <!-- 列表-表格 -->
     <upload-task-table ref="table"
-                       @open-clear="(e) => clear.open(e)"
-                       @open-detail="(e) => detail.open(e)" />
+                       @open-clear="(e) => clear.open(e)" />
     <!-- 清理模态框 -->
     <upload-task-clear-modal ref="clear"
                              @clear="clearCallback" />
@@ -25,7 +24,6 @@
 
   const render = ref(false);
   const table = ref();
-  const detail = ref();
   const clear = ref();
 
   // 清理回调
diff --git a/orion-ops-ui/src/views/job/exec-job-log-view/index.vue b/orion-ops-ui/src/views/job/exec-job-log-view/index.vue
index c9a8d2c1..a36cbd3a 100644
--- a/orion-ops-ui/src/views/job/exec-job-log-view/index.vue
+++ b/orion-ops-ui/src/views/job/exec-job-log-view/index.vue
@@ -36,9 +36,9 @@
   };
 
   onMounted(() => {
-    const isParam = route.query.id;
-    if (isParam) {
-      init(Number.parseInt(isParam as string));
+    const idParam = route.query.id;
+    if (idParam) {
+      init(Number.parseInt(idParam as string));
     }
   });