From 28a53fe81cdb551d2bf2023167487a3060e0f180 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 30 十月 2024 00:35:51 +0800
Subject: [PATCH] 一些更改
---
src/api/tigerapi/tsk/tsk_job.ts | 200 ++++++++++++++++++++++++++------------------------
1 files changed, 104 insertions(+), 96 deletions(-)
diff --git a/src/api/tigerapi/tsk/tsk_job.ts b/src/api/tigerapi/tsk/tsk_job.ts
index ccd3380..30a7cdd 100644
--- a/src/api/tigerapi/tsk/tsk_job.ts
+++ b/src/api/tigerapi/tsk/tsk_job.ts
@@ -1,12 +1,12 @@
-import { buildUUID } from '../../../utils/uuid';
import { ApiAction, ApiActionPage } from '../../model/baseModel';
import {
- Tsk_JobListItem,
+ FluentJobParam,
Tsk_JobPageListGetResultModel,
Tsk_JobPageParams,
Tsk_TrigListItem,
+ TskParameter,
} from '../model/tskModel';
-import { genAction,genActionjob, Api, genActionPage } from '../system';
+import { genAction, Api, genActionPage, generateAction } from '../system';
import { defHttp } from '/@/utils/http/axios';
import { useGlobSetting } from '/@/hooks/setting';
@@ -15,41 +15,40 @@
* 鑾峰彇瑙掕壊鍒嗛〉鍒楄〃
*/
export const getTsk_JobListByPage = async (params: Tsk_JobPageParams) => {
- var id='';
- if(params?.Status != undefined && params?.Status != ''){
- let sqlcmdt='';
- sqlcmdt += " STATUS = '" + params?.Status + "'";;
+ const id = '';
+ if (params?.Status != undefined && params?.Status != '') {
+ let sqlcmdt = '';
+ sqlcmdt += " STATUS = '" + params?.Status + "'";
const _data = await defHttp.post<ApiAction<Tsk_TrigListItem[]>>(
- { url: Api.EntityList, params: genAction('TSK_TRIG', sqlcmdt) },
+ { url: Api.EntityList, params: genAction('TSK_TRIG', sqlcmdt, undefined, true) },
{
isTransformResponse: false,
- apiUrl: globSetting.taskApiUrl
+ apiUrl: globSetting.taskApiUrl,
},
);
- let sqlcmd='';
- _data.Data.forEach((item,index) => {
- if(index==0){
- sqlcmd+="and ID='"+item.JobId+"'"
- }else{
- sqlcmd+="Or ID='"+item.JobId+"'"
- }
-
- });
- const rParams = genActionPage('TSK_JOB', sqlcmd, params.page, params.pageSize);
- return getTsk_JobListByPageAsync(rParams);
- }else{
let sqlcmd = '';
- if (id!= undefined && id != '') {
+ _data.Data.forEach((item, index) => {
+ if (index == 0) {
+ sqlcmd += "and ID='" + item.JobId + "'";
+ } else {
+ sqlcmd += "Or ID='" + item.JobId + "'";
+ }
+ });
+ const rParams = genActionPage('TSK_JOB', sqlcmd, params.page, params.pageSize);
+ return getTsk_JobListByPageAsync(rParams);
+ } else {
+ let sqlcmd = '';
+ if (id != undefined && id != '') {
sqlcmd += " And ID = '" + id + "'";
}
if (params?.JobName != undefined && params?.JobName != '') {
sqlcmd += " And JobName like '%" + params?.JobName + "%'";
}
if (params?.CREATE_TIME != undefined && params?.CREATE_TIME != '') {
- sqlcmd += "And CREATE_TIME > '" + params?.CREATE_TIME[0]+"'";
+ sqlcmd += "And CREATE_TIME > '" + params?.CREATE_TIME[0] + "'";
}
if (params?.CREATE_TIME != undefined && params?.CREATE_TIME != '') {
- sqlcmd += "And CREATE_TIME < '" + params?.CREATE_TIME[1]+"'";
+ sqlcmd += "And CREATE_TIME < '" + params?.CREATE_TIME[1] + "'";
}
const rParams = genActionPage('TSK_JOB', sqlcmd, params.page, params.pageSize);
return getTsk_JobListByPageAsync(rParams);
@@ -60,7 +59,7 @@
{ url: Api.EntityPageList, params },
{
isTransformResponse: false,
- apiUrl: globSetting.taskApiUrl
+ apiUrl: globSetting.taskApiUrl,
},
);
const model: Tsk_JobPageListGetResultModel = {
@@ -68,7 +67,7 @@
total: data.Data.totals,
};
// data.Data.data.forEach(function(item) {
-
+
// defHttp.post(
// { url: Api.AddJob, params: genActionjob(item.JobType, item.AssemblyName,item.JobName,item.Triggers[0].Args) },
// {
@@ -80,76 +79,82 @@
return model;
}
-export const SaveTsk_Job = async (params: Tsk_JobListItem, isUpdate: boolean) => {
- let data;
- if (isUpdate) {
- params.uPeriod = params.Period
- data = await defHttp.post(
- { url: Api.UpdateJob, params: genAction('TSK_JOB',params)},
- {
- errorMessageMode: 'none',
- isTransformResponse: false,
- apiUrl: globSetting.taskApiUrl
- },
- );
- } else {
- params.ID = buildUUID(); //鐢熸垚GUID
- data = await defHttp.post(
- { url: Api.AddJob, params: genActionjob(params.JobType, params.AssemblyName,params.JobName,params.Period,params.Remark) },
- {
- errorMessageMode: 'none',
- isTransformResponse: false,
- apiUrl: globSetting.taskApiUrl
- },
- );
- // //娣诲姞浠诲姟鏁版嵁鍒版暟鎹簱
- // data.Data.JobName=params.JobName;
- // data.Data.Remark=params.Remark;
- // data.Data.JobType=params.JobType;
- // var job=await defHttp.post(
- // {
- // url:Api.AddEntity,params:genAction('TSK_JOB',data.Data)
- // },
- // {
- // errorMessageMode:'none',
- // isTransformResponse:false,
- // apiUrl: globSetting.taskApiUrl
- // });
- // data.Data.Triggers[0].Args=params.Time*60*1000
- // data.Data.Triggers[0].JobId=data.Data.ID
- // var trig = defHttp.post(
- // {
- // url:Api.AddEntity,params:genAction('TSK_TRIG',data.Data.Triggers[0])
- // },
- // {
- // errorMessageMode:'none',
- // isTransformResponse:false,
- // apiUrl: globSetting.taskApiUrl
- // });
- }
-
- return data;
-};
-//鍒犻櫎
-export const DeleteTsk_Job = async (params: Recordable) => {
- const usParams = genAction('TSK_JOB', [params]);
- const usParamstrig = genAction('TSK_TRIG', [params.Triggers]);
- defHttp.post({ url: Api.DeleteList, params: usParamstrig },
- {
- errorMessageMode: 'none',
- isTransformResponse: false,
- apiUrl: globSetting.taskApiUrl
- },);
+/**
+ * 淇濆瓨浠诲姟
+ */
+export const SaveTskJob = async (params: TskParameter) => {
+ const usParams = genAction('TSK_JOB', params);
return await defHttp.post(
- { url: Api.DeleteList, params: usParams },
+ { url: Api.SaveTskJob, params: usParams },
{
errorMessageMode: 'none',
isTransformResponse: false,
- apiUrl: globSetting.taskApiUrl
+ apiUrl: globSetting.taskApiUrl,
},
);
};
-//寮�濮嬩换鍔�
+
+/**
+ * @desc 娣诲姞浠诲姟
+ * @param {FluentJobParam} params - 鍙傛暟鍒楄〃
+ */
+export const AddTskJob = async (params: FluentJobParam) => {
+ const usParams = generateAction(params.DataType, params.AssemblyName, params);
+ return await defHttp.post(
+ { url: Api.AddTskJob, params: usParams },
+ {
+ errorMessageMode: 'none',
+ isTransformResponse: false,
+ apiUrl: globSetting.taskApiUrl,
+ },
+ );
+};
+
+/**
+ * @desc 绔嬪嵆杩愯浠诲姟
+ */
+export const ImmediateRun = async (params: FluentJobParam) => {
+ const usParams = generateAction(params.DataType, params.AssemblyName, params.JobName);
+ return await defHttp.post(
+ { url: Api.ImmediateRun, params: usParams },
+ {
+ errorMessageMode: 'none',
+ isTransformResponse: false,
+ apiUrl: globSetting.taskApiUrl,
+ },
+ );
+};
+
+/**
+ * @desc 鍒犻櫎
+ * @param {Recordable} params - 璁板綍
+ */
+export const DeleteTsk_Job = async (params: Recordable) => {
+ const usParams = genAction('TSK_JOB', [params]);
+ const usParamstrig = genAction('TSK_TRIG', params.Triggers);
+ return await defHttp
+ .post(
+ { url: Api.DeleteList, params: usParams },
+ {
+ errorMessageMode: 'none',
+ isTransformResponse: false,
+ apiUrl: globSetting.taskApiUrl,
+ },
+ )
+ .then(() => {
+ defHttp.post(
+ { url: Api.DeleteList, params: usParamstrig },
+ {
+ errorMessageMode: 'none',
+ isTransformResponse: false,
+ apiUrl: globSetting.taskApiUrl,
+ },
+ );
+ });
+};
+/**
+ * @desc 寮�濮嬩换鍔�
+ */
export const StartTsk_Job = async (params: Recordable) => {
const usParams = genAction('TSK_JOB', params.JobName);
return await defHttp.post(
@@ -157,31 +162,34 @@
{
errorMessageMode: 'none',
isTransformResponse: false,
- apiUrl: globSetting.taskApiUrl
+ apiUrl: globSetting.taskApiUrl,
},
);
};
-//鍋滄浠诲姟
+
+/**
+ * @desc 鍋滄浠诲姟
+ */
export const StopTsk_Job = async (params: Recordable) => {
const usParams = genAction('TSK_JOB', params.JobName);
return await defHttp.post(
- { url: Api.StopJob, params: usParams },
+ { url: Api.RemoveTskJob, params: usParams },
{
errorMessageMode: 'none',
isTransformResponse: false,
- apiUrl: globSetting.taskApiUrl
+ apiUrl: globSetting.taskApiUrl,
},
);
};
//涓嬫媺鍒楄〃
-export const optionsListApi = async (params: Recordable) => {
- const usParams = genAction('TSK_TRIG+Statuss', "");
+export const optionsListApi = async () => {
+ const usParams = genAction('TSK_TRIG+Statuss', '');
return await defHttp.post(
{ url: Api.urlQueryEnum, params: usParams },
{
errorMessageMode: 'none',
isTransformResponse: false,
- apiUrl: globSetting.taskApiUrl
+ apiUrl: globSetting.taskApiUrl,
},
);
};
--
Gitblit v1.9.3