update 优化工作流代码与接口命名

2024-03-07 14:23:24 +08:00
parent 0108df1334
commit e7ff829502
15 changed files with 107 additions and 110 deletions
--- a/src/api/workflow/processDefinition/index.ts
+++ b/src/api/workflow/processDefinition/index.ts
@ -1,7 +1,6 @@
 import request from '@/utils/request';
-import { ProcessDefinitionQuery, ProcessDefinitionVO, ProcessDefinitionXmlVO } from '@/api/workflow/processDefinition/types';
+import { ProcessDefinitionQuery, ProcessDefinitionVO, definitionXmlVO } from '@/api/workflow/processDefinition/types';
 import { AxiosPromise } from 'axios';
-const baseUrl = import.meta.env.VITE_APP_BASE_API;

 /**
 * 获取流程定义列表
@ -20,9 +19,9 @@ export const listProcessDefinition = (query: ProcessDefinitionQuery): AxiosPromi
 * @param processInstanceId 流程实例id
 * @returns
 */
-export const getProcessDefinitionListByKey = (key: string) => {
+export const getListByKey = (key: string) => {
  return request({
-    url: `/workflow/processDefinition/getProcessDefinitionListByKey/${key}`,
+    url: `/workflow/processDefinition/getListByKey/${key}`,
    method: 'get'
  });
 };
@ -30,9 +29,9 @@ export const getProcessDefinitionListByKey = (key: string) => {
 /**
 * 通过流程定义id获取流程图
 */
-export const processDefinitionImage = (processDefinitionId: string): AxiosPromise<any> => {
+export const definitionImage = (processDefinitionId: string): AxiosPromise<any> => {
  return request({
-    url: `/workflow/processDefinition/processDefinitionImage/${processDefinitionId}` + '?t' + Math.random(),
+    url: `/workflow/processDefinition/definitionImage/${processDefinitionId}` + '?t' + Math.random(),
    method: 'get'
  });
 };
@ -42,9 +41,9 @@ export const processDefinitionImage = (processDefinitionId: string): AxiosPromis
 * @param processDefinitionId 流程定义id
 * @returns
 */
-export const processDefinitionXml = (processDefinitionId: string): AxiosPromise<ProcessDefinitionXmlVO> => {
+export const definitionXml = (processDefinitionId: string): AxiosPromise<definitionXmlVO> => {
  return request({
-    url: `/workflow/processDefinition/processDefinitionXml/${processDefinitionId}`,
+    url: `/workflow/processDefinition/definitionXml/${processDefinitionId}`,
    method: 'get'
  });
 };
@ -67,9 +66,9 @@ export const deleteProcessDefinition = (deploymentId: string, processDefinitionI
 * @param processDefinitionId 流程定义id
 * @returns
 */
-export const updateProcessDefState = (processDefinitionId: string) => {
+export const updateDefinitionState = (processDefinitionId: string) => {
  return request({
-    url: `/workflow/processDefinition/updateProcessDefState/${processDefinitionId}`,
+    url: `/workflow/processDefinition/updateDefinitionState/${processDefinitionId}`,
    method: 'put'
  });
 };
@ -104,20 +103,10 @@ export function deployProcessFile(data: any) {
 * @param fromProcessDefinitionId
 * @returns
 */
-export const migrationProcessDefinition = (currentProcessDefinitionId: string, fromProcessDefinitionId: string) => {
+export const migrationDefinition = (currentProcessDefinitionId: string, fromProcessDefinitionId: string) => {
  return request({
-    url: `/workflow/processDefinition/migrationProcessDefinition/${currentProcessDefinitionId}/${fromProcessDefinitionId}`,
+    url: `/workflow/processDefinition/migrationDefinition/${currentProcessDefinitionId}/${fromProcessDefinitionId}`,
    method: 'put'
  });
 };

-/**
- * 查询流程定义列表
- * @returns
- */
-export const getProcessDefinitionList = () => {
-  return request({
-    url: `/workflow/processDefinition/getProcessDefinitionList`,
-    method: 'get'
-  });
-};
--- a/src/api/workflow/processDefinition/types.ts
+++ b/src/api/workflow/processDefinition/types.ts
@ -16,7 +16,7 @@ export interface ProcessDefinitionVO extends BaseEntity {
  deploymentTime: string;
 }

-export interface ProcessDefinitionXmlVO {
+export interface definitionXmlVO {
  xml: string[];
  xmlStr: string;
 }
--- a/src/api/workflow/processInstance/index.ts
+++ b/src/api/workflow/processInstance/index.ts
@ -1,17 +1,15 @@
 import request from '@/utils/request';
 import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types';
 import { AxiosPromise } from 'axios';
-import { string } from 'vue-types';
-const baseUrl = import.meta.env.VITE_APP_BASE_API;

 /**
 * 查询运行中实例列表
 * @param query
 * @returns {*}
 */
-export const getProcessInstanceRunningByPage = (query: ProcessInstanceQuery): AxiosPromise<ProcessInstanceVO[]> => {
+export const getPageByRunning = (query: ProcessInstanceQuery): AxiosPromise<ProcessInstanceVO[]> => {
  return request({
-    url: '/workflow/processInstance/getProcessInstanceRunningByPage',
+    url: '/workflow/processInstance/getPageByRunning',
    method: 'get',
    params: query
  });
@ -22,9 +20,9 @@ export const getProcessInstanceRunningByPage = (query: ProcessInstanceQuery): Ax
 * @param query
 * @returns {*}
 */
-export const getProcessInstanceFinishByPage = (query: ProcessInstanceQuery): AxiosPromise<ProcessInstanceVO[]> => {
+export const getPageByFinish = (query: ProcessInstanceQuery): AxiosPromise<ProcessInstanceVO[]> => {
  return request({
-    url: '/workflow/processInstance/getProcessInstanceFinishByPage',
+    url: '/workflow/processInstance/getPageByFinish',
    method: 'get',
    params: query
  });
@ -33,9 +31,19 @@ export const getProcessInstanceFinishByPage = (query: ProcessInstanceQuery): Axi
 /**
 * 通过流程实例id获取历史流程图
 */
-export const getHistoryProcessImage = (processInstanceId: string) => {
+export const getHistoryImage = (processInstanceId: string) => {
  return request({
-    url: `/workflow/processInstance/getHistoryProcessImage/${processInstanceId}` + '?t' + Math.random(),
+    url: `/workflow/processInstance/getHistoryImage/${processInstanceId}` + '?t' + Math.random(),
+    method: 'get'
+  });
+};
+
+/**
+ * 通过流程实例id获取历史流程图运行中，历史等节点
+ */
+export const getHistoryList = (processInstanceId: string) => {
+  return request({
+    url: `/workflow/processInstance/getHistoryList/${processInstanceId}` + '?t' + Math.random(),
    method: 'get'
  });
 };
@ -57,9 +65,9 @@ export const getHistoryRecord = (processInstanceId: string) => {
 * @param data 参数
 * @returns
 */
-export const deleteRuntimeProcessInst = (data: object) => {
+export const deleteRunInstance = (data: object) => {
  return request({
-    url: `/workflow/processInstance/deleteRuntimeProcessInst`,
+    url: `/workflow/processInstance/deleteRunInstance`,
    method: 'post',
    data: data
  });
@ -70,9 +78,9 @@ export const deleteRuntimeProcessInst = (data: object) => {
 * @param processInstanceId 流程实例id
 * @returns
 */
-export const deleteRuntimeProcessAndHisInst = (processInstanceId: string | string[]) => {
+export const deleteRunAndHisInstance = (processInstanceId: string | string[]) => {
  return request({
-    url: `/workflow/processInstance/deleteRuntimeProcessAndHisInst/${processInstanceId}`,
+    url: `/workflow/processInstance/deleteRunAndHisInstance/${processInstanceId}`,
    method: 'delete'
  });
 };
@ -82,9 +90,9 @@ export const deleteRuntimeProcessAndHisInst = (processInstanceId: string | strin
 * @param processInstanceId 流程实例id
 * @returns
 */
-export const deleteFinishProcessAndHisInst = (processInstanceId: string | string[]) => {
+export const deleteFinishAndHisInstance = (processInstanceId: string | string[]) => {
  return request({
-    url: `/workflow/processInstance/deleteFinishProcessAndHisInst/${processInstanceId}`,
+    url: `/workflow/processInstance/deleteFinishAndHisInstance/${processInstanceId}`,
    method: 'delete'
  });
 };
@ -94,9 +102,9 @@ export const deleteFinishProcessAndHisInst = (processInstanceId: string | string
 * @param query
 * @returns {*}
 */
-export const getCurrentSubmitByPage = (query: ProcessInstanceQuery): AxiosPromise<ProcessInstanceVO[]> => {
+export const getPageByCurrent = (query: ProcessInstanceQuery): AxiosPromise<ProcessInstanceVO[]> => {
  return request({
-    url: '/workflow/processInstance/getCurrentSubmitByPage',
+    url: '/workflow/processInstance/getPageByCurrent',
    method: 'get',
    params: query
  });
--- a/src/api/workflow/task/index.ts
+++ b/src/api/workflow/task/index.ts
@ -6,9 +6,9 @@ import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
 * @param query
 * @returns {*}
 */
-export const getTaskWaitByPage = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const getPageByTaskWait = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
  return request({
-    url: '/workflow/task/getTaskWaitByPage',
+    url: '/workflow/task/getPageByTaskWait',
    method: 'get',
    params: query
  });
@ -19,9 +19,9 @@ export const getTaskWaitByPage = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
 * @param query
 * @returns {*}
 */
-export const getTaskFinishByPage = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const getPageByTaskFinish = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
  return request({
-    url: '/workflow/task/getTaskFinishByPage',
+    url: '/workflow/task/getPageByTaskFinish',
    method: 'get',
    params: query
  });
@ -32,9 +32,9 @@ export const getTaskFinishByPage = (query: TaskQuery): AxiosPromise<TaskVO[]> =>
 * @param query
 * @returns {*}
 */
-export const getTaskCopyByPage = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const getPageByTaskCopy = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
  return request({
-    url: '/workflow/task/getTaskCopyByPage',
+    url: '/workflow/task/getPageByTaskCopy',
    method: 'get',
    params: query
  });
@ -45,9 +45,9 @@ export const getTaskCopyByPage = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
 * @param query
 * @returns {*}
 */
-export const getAllTaskWaitByPage = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const getPageByAllTaskWait = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
  return request({
-    url: '/workflow/task/getAllTaskWaitByPage',
+    url: '/workflow/task/getPageByAllTaskWait',
    method: 'get',
    params: query
  });
@ -58,9 +58,9 @@ export const getAllTaskWaitByPage = (query: TaskQuery): AxiosPromise<TaskVO[]> =
 * @param query
 * @returns {*}
 */
-export const getAllTaskFinishByPage = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const getPageByAllTaskFinish = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
  return request({
-    url: '/workflow/task/getAllTaskFinishByPage',
+    url: '/workflow/task/getPageByAllTaskFinish',
    method: 'get',
    params: query
  });
@ -169,9 +169,9 @@ export const deleteMultiInstanceExecution = (data: object) => {

 /**
 * 修改任务办理人
- * @param taskIds 
- * @param userId 
- * @returns 
+ * @param taskIds
+ * @param userId
+ * @returns
 */
 export const updateAssignee = (taskIds: Array<string>,userId: string) => {
  return request({
--- a/src/api/workflow/workflowUser/index.ts
+++ b/src/api/workflow/workflowUser/index.ts
@ -7,9 +7,9 @@ import { UserVO } from '@/api/system/user/types';
 * @param query
 * @returns {*}
 */
-export const getWorkflowAddMultiListByPage = (query: object) => {
+export const getPageByAddMultiInstance = (query: object) => {
  return request({
-    url: '/workflow/user/getWorkflowAddMultiListByPage',
+    url: '/workflow/user/getPageByAddMultiInstance',
    method: 'get',
    params: query
  });
@ -20,9 +20,9 @@ export const getWorkflowAddMultiListByPage = (query: object) => {
 * @param query
 * @returns {*}
 */
-export const getWorkflowDeleteMultiInstanceList = (taskId: string) => {
+export const getListByDeleteMultiInstance = (taskId: string) => {
  return request({
-    url: '/workflow/user/getWorkflowDeleteMultiInstanceList/' + taskId,
+    url: '/workflow/user/getListByDeleteMultiInstance/' + taskId,
    method: 'get'
  });
 };
@ -44,9 +44,9 @@ export const getUserListByIds = (userIdList: any[]): AxiosPromise<UserVO[]> => {
 * @param query
 * @returns {*}
 */
-export const getUserListByPage = (query: object) => {
+export const getPageByUserList = (query: object) => {
  return request({
-    url: '/workflow/user/getUserListByPage',
+    url: '/workflow/user/getPageByUserList',
    method: 'get',
    params: query
  });