feat: 下发任务接口对接

yaklang · Nov 14, 2024 · 13de6e6 · 13de6e6
1 parent cbb83ed
commit 13de6e6
Show file tree

Hide file tree

Showing 21 changed files with 1,336 additions and 2,114 deletions.
diff --git a/src/apis/task/index.ts b/src/apis/task/index.ts
@@ -137,9 +137,9 @@ const postTaskStart = (
 
 // 任务列表 编辑回显
 const getTaskStartEditDispaly = (
-    id: string,
-): Promise<ResponseData<TableResponseData<any>>> =>
-    axios.get<never, ResponseData<TableResponseData<any>>>(
+    id: number,
+): Promise<ResponseData<TPostTaskStartRequest>> =>
+    axios.get<never, ResponseData<TPostTaskStartRequest>>(
         `/task/start/batch-invoking-script-task/fetch?id=${id}`,
     );
 

diff --git a/src/apis/task/types.ts b/src/apis/task/types.ts
@@ -90,23 +90,24 @@ type TNodeListRequest = Partial<{
 
 type TPromptArgs = Partial<{
     target: string;
-    'preset-protes': string[];
+    'preset-protes': string;
     ports: string;
     'enable-brute': boolean;
     'enbale-cve-baseline': boolean;
     execution_node: number;
     plugins: string;
     'scheduling-type': number;
-    timestamp: string[];
+    timestamp: number[];
     interval_seconds: string;
     interval_seconds_type: number;
+    execution_date: number;
 }>;
 
 type TPostTaskStartRequest = Partial<{
     task_id: string;
     task_group: string;
     script_type: string;
-    prompt_args: TPromptArgs;
+    params: TPromptArgs;
     scanner: string[];
     first: boolean;
 }>;

diff --git a/src/pages/TaskPageList/TaskPageList.tsx b/src/pages/TaskPageList/TaskPageList.tsx
@@ -88,7 +88,16 @@ const TaskPageList: FC = () => {
 
                     // 返回更新后的任务列表
                     return updatedSiderTaskGrounpAllList
-                        .concat(fetchResultdata)
+                        .concat(
+                            fetchResultdata.filter(
+                                (it) => it.name === '默认分组',
+                            ),
+                        )
+                        .concat(
+                            fetchResultdata.filter(
+                                (it) => it.name !== '默认分组',
+                            ),
+                        )
                         .filter((it) => it);
                 };
                 setSiderContextList(transformTaskGroupData);
@@ -224,7 +233,10 @@ const TaskPageList: FC = () => {
                     };
                 }}
             />
-            <CreateTaskScriptModal ref={openCreateTaskModalRef} />
+            <CreateTaskScriptModal
+                ref={openCreateTaskModalRef}
+                pageLoad={page.onLoad}
+            />
         </div>
     );
 };

diff --git a/src/pages/TaskPageList/compoment/CreateTaskScriptModal.tsx b/src/pages/TaskPageList/compoment/CreateTaskScriptModal.tsx
@@ -11,7 +11,10 @@ import { StartUpScriptModal } from '@/pages/TaskScript/compoment/StartUpScriptMo
 import { TGetAnalysisScriptReponse } from '@/apis/task/types';
 import { getScriptTaskGroup } from '@/apis/task';
 
-const CreateTaskScriptModal = forwardRef<UseModalRefType>(({}, ref) => {
+const CreateTaskScriptModal = forwardRef<
+    UseModalRefType,
+    { pageLoad: () => void }
+>(({ pageLoad }, ref) => {
     const [model1] = WizardModal.useModal();
     const StartUpScriptModalRef = useRef<UseModalRefType>(null);
 
@@ -112,6 +115,7 @@ const CreateTaskScriptModal = forwardRef<UseModalRefType>(({}, ref) => {
             <StartUpScriptModal
                 ref={StartUpScriptModalRef}
                 title={'创建任务'}
+                pageLoad={pageLoad}
             />
         </>
     );