From f11d6f866136c9d58ddb54e8dee5beac8ff97190 Mon Sep 17 00:00:00 2001
From: wb-msm261421 <wb-msm261421@alibaba-inc.com>
Date: Wed, 8 May 2024 11:13:04 +0800
Subject: [PATCH] feat: (sysom-web): Diagnosis offline preprocess_post_wrapper
 upload result xxx.tar.gz

---
 .../resource/diagnose/v2/multichannel.json    |  10 +-
 .../components/UploadResultFormModal.jsx      | 109 +++++++++++-------
 sysom_web/src/pages/diagnose/service.js       |  12 ++
 3 files changed, 87 insertions(+), 44 deletions(-)

diff --git a/sysom_web/public/resource/diagnose/v2/multichannel.json b/sysom_web/public/resource/diagnose/v2/multichannel.json
index e30d171b..0fd56878 100644
--- a/sysom_web/public/resource/diagnose/v2/multichannel.json
+++ b/sysom_web/public/resource/diagnose/v2/multichannel.json
@@ -29,11 +29,17 @@
                         "disabled": true
                     },
                     {
-                        "type": "text",
+                        "type": "select",
                         "name": "sysom_preprocess_post_wrapper",
                         "initialValue": "dummy",
                         "label": "命令包装器",
-                        "disabled": false
+                        "tooltips": "压缩包导入适用于离线环境",
+                        "options": [
+                            {
+                                "value": "dummy",
+                                "label": "压缩包导入"
+                            }
+                        ]
                     }
                 ]
             },
diff --git a/sysom_web/src/pages/diagnose/components/UploadResultFormModal.jsx b/sysom_web/src/pages/diagnose/components/UploadResultFormModal.jsx
index 380f4be3..c469d923 100644
--- a/sysom_web/src/pages/diagnose/components/UploadResultFormModal.jsx
+++ b/sysom_web/src/pages/diagnose/components/UploadResultFormModal.jsx
@@ -1,14 +1,14 @@
 /*
  * @Author: wb-msm241621
  * @Date: 2023-12-25 11:04:40
- * @LastEditTime: 2024-01-04 17:57:38
+ * @LastEditTime: 2024-05-08 11:11:37
  * @Description: 
  */
 
 import { ModalForm, ProFormText, ProFormTextArea, ProFormUploadDragger, ProFormSelect } from '@ant-design/pro-form'
 import { Button } from 'antd'
 import { useIntl, FormattedMessage } from 'umi';
-import { sbsOfflineTaskResult } from '../service'
+import { sbsOfflineTaskResult, sbsOfflineTaskResultByTar } from '../service'
 
 
 const UploadResultFormModal = (props) => {
@@ -16,27 +16,81 @@ const UploadResultFormModal = (props) => {
 
     const uploadResultEvent = async (params) => {
         let status = true
-        if (params.content_encoding == "base64") {
+        const formData = new FormData()
+
+        if (params.content_encoding && params.content_encoding == "base64") {
             params['results'] = btoa(params.results)
         }
-        const formData = new FormData()
+        
         for (let key in params) {
             if ('files' == key) {
-                const files = params[key].map((item) => { return item.originFileObj })
-                formData.append(key, files)
+                params.files.forEach((item) => { formData.append(key, item.originFileObj)})
             } else {
                 formData.append(key, params[key])
             }
         }
 
-        await sbsOfflineTaskResult(formData).then((res) => {
-            props.onSuccessCallBack()
-        }).catch((error) => {
-            status = false
-        })
+        if (props.record.sysom_preprocess_post_wrapper === 'dummy') {
+            await sbsOfflineTaskResultByTar(formData).then((res) => {
+                props.onSuccessCallBack()
+            }).catch((error) => {
+                status = false
+           })
+        } else {
+            await sbsOfflineTaskResult(formData).then((res) => {
+                props.onSuccessCallBack()
+            }).catch((error) => {
+                status = false
+           })
+        }
         return status
     }
 
+    const DummyFormItem = () => {
+        /*
+        压缩包导入
+        */
+        return (
+            <ProFormUploadDragger
+                name="files"
+                accept='.tar.gz'
+                label={
+                    intl.formatMessage({
+                        id: "pages.diagnose.offlinetaskresultannex",
+                        defaultMessage: "offline task result annex"
+                    })}
+                fieldProps={{
+                    beforeUpload: () => { return false }
+                }}
+            />
+        )
+    }
+    
+    const OtherImportFormItem = () => {
+        return (
+            <>
+                <ProFormTextArea
+                    width="md"
+                    name="results"
+                    rules={[
+                        { required: true, message: 'field offline task result required!' }
+                    ]}
+                    label={intl.formatMessage({ id: "pages.diagnose.offlinetaskresult", defaultMessage: "offline task result" })}
+                />
+                <ProFormSelect
+                    width="md"
+                    valueEnum={{
+                        text: 'text',
+                        base64: 'base64',
+                    }}
+                    initialValue={"text"}
+                    name="content_encoding"
+                    label={intl.formatMessage({ id: "pages.diagnose.selectencoding", defaultMessage: "select encoding result" })}
+                />
+            </>
+        )
+    }
+    const formItemMap = new Object({'dummy': <DummyFormItem />, 'other': <OtherImportFormItem />});
     return <ModalForm
         title={
             intl.formatMessage({
@@ -53,7 +107,6 @@ const UploadResultFormModal = (props) => {
             return await uploadResultEvent(params)
         }}
     >
-
         <ProFormText
             width="md"
             name="task_id"
@@ -63,36 +116,8 @@ const UploadResultFormModal = (props) => {
                 defaultMessage: "Diagnosis ID"
             })}
         />
-        <ProFormTextArea
-            width="md"
-            name="results"
-            rules={[
-                { required: true, message: 'field offline task result required!' }
-            ]}
-            label={intl.formatMessage({ id: "pages.diagnose.offlinetaskresult", defaultMessage: "offline task result" })}
-        />
-        <ProFormSelect
-            width="md"
-            valueEnum={{
-                text: 'text',
-                base64: 'base64',
-            }}
-            initialValue={"text"}
-            name="content_encoding"
-            label={intl.formatMessage({ id: "pages.diagnose.selectencoding", defaultMessage: "select encoding result" })}
-        />
-        <ProFormUploadDragger
-            name="files"
-            label={
-                intl.formatMessage({
-                    id: "pages.diagnose.offlinetaskresultannex",
-                    defaultMessage: "offline task result annex"
-                })}
-            fieldProps={{
-                beforeUpload: () => { return false }
-            }}
-        />
-
+        {/* { props.record.sysom_preprocess_post_wrapper === 'dummy'? <DummyFormItem />: <OtherImportFormItem />} */}
+        { formItemMap[props.record.sysom_preprocess_post_wrapper] }
     </ModalForm>
 }
 
diff --git a/sysom_web/src/pages/diagnose/service.js b/sysom_web/src/pages/diagnose/service.js
index 06f1ac05..913b67d7 100644
--- a/sysom_web/src/pages/diagnose/service.js
+++ b/sysom_web/src/pages/diagnose/service.js
@@ -135,3 +135,15 @@ export async function sbsOfflineTaskResult(data, options) {
     ...(options || {})
   })
 }
+
+export async function sbsOfflineTaskResultByTar(data, options) {
+  const token = localStorage.getItem('token');
+  return request("/api/v1/tasks/sbs_task_result_by_tar/", {
+    method: 'post',
+    data: data,
+    headers: {
+      'Authorization': token,
+    },
+    ...(options || {})
+  })
+}
-- 
Gitee