!6 同步develop分支

* sync -- 同步develop分支

ruoyi-ui/src/api/workflow/category.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询流程分类列表
+export function listCategory(query) {
+  return request({
+    url: '/workflow/category/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询流程分类详细
+export function getCategory(categoryId) {
+  return request({
+    url: '/workflow/category/' + categoryId,
+    method: 'get'
+  })
+}
+
+// 新增流程分类
+export function addCategory(data) {
+  return request({
+    url: '/workflow/category',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改流程分类
+export function updateCategory(data) {
+  return request({
+    url: '/workflow/category',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除流程分类
+export function delCategory(categoryId) {
+  return request({
+    url: '/workflow/category/' + categoryId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/workflow/definition.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询流程定义列表
 export function listDefinition(query) {
   return request({
-    url: '/flowable/definition/list',
+    url: '/workflow/definition/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listDefinition(query) {
 // 部署流程实例
 export function definitionStart(procDefId,data) {
   return request({
-    url: '/flowable/definition/start/' + procDefId,
+    url: '/workflow/definition/start/' + procDefId,
     method: 'post',
     data: data
   })
@@ -21,7 +21,7 @@ export function definitionStart(procDefId,data) {
 // 获取流程变量
 export function getProcessVariables(taskId) {
   return request({
-    url: '/flowable/task/processVariables/' + taskId,
+    url: '/workflow/task/processVariables/' + taskId,
     method: 'get'
   })
 }
@@ -29,7 +29,7 @@ export function getProcessVariables(taskId) {
 // 激活/挂起流程
 export function updateState(params) {
   return request({
-    url: '/flowable/definition/updateState',
+    url: '/workflow/definition/updateState',
     method: 'put',
     params: params
   })
@@ -38,7 +38,7 @@ export function updateState(params) {
 // 指定流程办理人员列表
 export function userList(query) {
   return request({
-    url: '/flowable/definition/userList',
+    url: '/workflow/definition/userList',
     method: 'get',
     params: query
   })
@@ -47,7 +47,7 @@ export function userList(query) {
 // 指定流程办理组列表
 export function roleList(query) {
   return request({
-    url: '/flowable/definition/roleList',
+    url: '/workflow/definition/roleList',
     method: 'get',
     params: query
   })
@@ -56,14 +56,14 @@ export function roleList(query) {
 // 读取xml文件
 export function readXml(deployId) {
   return request({
-    url: '/flowable/definition/readXml/' + deployId,
+    url: '/workflow/definition/readXml/' + deployId,
     method: 'get'
   })
 }
 // 读取image文件
 export function readImage(deployId) {
   return request({
-    url: '/flowable/definition/readImage/' + deployId,
+    url: '/workflow/definition/readImage/' + deployId,
     method: 'get'
   })
 }
@@ -71,7 +71,7 @@ export function readImage(deployId) {
 // 读取image文件
 export function getFlowViewer(procInsId) {
   return request({
-    url: '/flowable/task/flowViewer/' + procInsId,
+    url: '/workflow/task/flowViewer/' + procInsId,
     method: 'get'
   })
 }
@@ -79,7 +79,7 @@ export function getFlowViewer(procInsId) {
 // 读取xml文件
 export function saveXml(data) {
   return request({
-    url: '/flowable/definition/save',
+    url: '/workflow/definition/save',
     method: 'post',
     data: data
   })
@@ -106,7 +106,7 @@ export function updateDeployment(data) {
 // 删除流程定义
 export function delDeployment(query) {
   return request({
-    url: '/flowable/definition/delete/',
+    url: '/workflow/definition/delete/',
     method: 'delete',
     params: query
   })

ruoyi-ui/src/api/workflow/finished.js

@@ -1,10 +1,9 @@
 import request from '@/utils/request'
-import da from "element-ui/src/locale/lang/da";
 
 // 查询已办任务列表
 export function finishedList(query) {
   return request({
-    url: '/flowable/task/finishedList',
+    url: '/workflow/task/finishedList',
     method: 'get',
     params: query
   })
@@ -13,7 +12,7 @@ export function finishedList(query) {
 // 任务流转记录
 export function flowRecord(query) {
   return request({
-    url: '/flowable/task/flowRecord',
+    url: '/workflow/task/flowRecord',
     method: 'get',
     params: query
   })
@@ -22,7 +21,7 @@ export function flowRecord(query) {
 // 撤回任务
 export function revokeProcess(data) {
   return request({
-    url: '/flowable/task/revokeProcess',
+    url: '/workflow/task/revokeProcess',
     method: 'post',
     data: data
   })
@@ -31,7 +30,7 @@ export function revokeProcess(data) {
 // 部署流程实例
 export function deployStart(deployId) {
   return request({
-    url: '/flowable/process/startFlow/' + deployId,
+    url: '/workflow/process/startFlow/' + deployId,
     method: 'get',
   })
 }

ruoyi-ui/src/api/workflow/form.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询流程表单列表
 export function listForm(query) {
   return request({
-    url: '/flowable/form/list',
+    url: '/workflow/form/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listForm(query) {
 // 查询流程表单详细
 export function getForm(formId) {
   return request({
-    url: '/flowable/form/' + formId,
+    url: '/workflow/form/' + formId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getForm(formId) {
 // 新增流程表单
 export function addForm(data) {
   return request({
-    url: '/flowable/form',
+    url: '/workflow/form',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addForm(data) {
 // 修改流程表单
 export function updateForm(data) {
   return request({
-    url: '/flowable/form',
+    url: '/workflow/form',
     method: 'put',
     data: data
   })
@@ -37,7 +37,7 @@ export function updateForm(data) {
 // 挂载表单
 export function addDeployForm(data) {
   return request({
-    url: '/flowable/form/addDeployForm',
+    url: '/workflow/form/addDeployForm',
     method: 'post',
     data: data
   })
@@ -46,7 +46,7 @@ export function addDeployForm(data) {
 // 删除流程表单
 export function delForm(formId) {
   return request({
-    url: '/flowable/form/' + formId,
+    url: '/workflow/form/' + formId,
     method: 'delete'
   })
 }
@@ -54,7 +54,7 @@ export function delForm(formId) {
 // 导出流程表单
 export function exportForm(query) {
   return request({
-    url: '/flowable/form/export',
+    url: '/workflow/form/export',
     method: 'get',
     params: query
   })

ruoyi-ui/src/api/workflow/process.js

@@ -1,10 +1,9 @@
 import request from '@/utils/request'
-import da from "element-ui/src/locale/lang/da";
 
 // 我的发起的流程
 export function myProcessList(query) {
   return request({
-    url: '/flowable/task/myProcess',
+    url: '/workflow/task/myProcess',
     method: 'get',
     params: query
   })
@@ -13,7 +12,7 @@ export function myProcessList(query) {
 // 完成任务
 export function complete(data) {
   return request({
-    url: '/flowable/task/complete',
+    url: '/workflow/task/complete',
     method: 'post',
     data: data
   })
@@ -22,7 +21,7 @@ export function complete(data) {
 // 取消申请
 export function stopProcess(data) {
   return request({
-    url: '/flowable/task/stopProcess',
+    url: '/workflow/task/stopProcess',
     method: 'post',
     data: data
   })
@@ -31,7 +30,7 @@ export function stopProcess(data) {
 // 驳回任务
 export function rejectTask(data) {
   return request({
-    url: '/flowable/task/reject',
+    url: '/workflow/task/reject',
     method: 'post',
     data: data
   })
@@ -40,7 +39,7 @@ export function rejectTask(data) {
 // 可退回任务列表
 export function returnList(data) {
   return request({
-    url: '/flowable/task/returnList',
+    url: '/workflow/task/returnList',
     method: 'post',
     data: data
   })
@@ -49,7 +48,7 @@ export function returnList(data) {
 // 部署流程实例
 export function deployStart(deployId) {
   return request({
-    url: '/flowable/process/startFlow/' + deployId,
+    url: '/workflow/process/startFlow/' + deployId,
     method: 'get',
   })
 }

ruoyi-ui/src/api/workflow/todo.js

@@ -1,10 +1,9 @@
 import request from '@/utils/request'
-import da from "element-ui/src/locale/lang/da";
 
 // 查询待办任务列表
 export function todoList(query) {
   return request({
-    url: '/flowable/task/todoList',
+    url: '/workflow/task/todoList',
     method: 'get',
     params: query
   })
@@ -13,7 +12,7 @@ export function todoList(query) {
 // 完成任务
 export function complete(data) {
   return request({
-    url: '/flowable/task/complete',
+    url: '/workflow/task/complete',
     method: 'post',
     data: data
   })
@@ -22,7 +21,7 @@ export function complete(data) {
 // 委派任务
 export function delegate(data) {
   return request({
-    url: '/flowable/task/delegate',
+    url: '/workflow/task/delegate',
     method: 'post',
     data: data
   })
@@ -31,7 +30,7 @@ export function delegate(data) {
 // 退回任务
 export function returnTask(data) {
   return request({
-    url: '/flowable/task/return',
+    url: '/workflow/task/return',
     method: 'post',
     data: data
   })
@@ -40,7 +39,7 @@ export function returnTask(data) {
 // 驳回任务
 export function rejectTask(data) {
   return request({
-    url: '/flowable/task/reject',
+    url: '/workflow/task/reject',
     method: 'post',
     data: data
   })
@@ -49,7 +48,7 @@ export function rejectTask(data) {
 // 可退回任务列表
 export function returnList(data) {
   return request({
-    url: '/flowable/task/returnList',
+    url: '/workflow/task/returnList',
     method: 'post',
     data: data
   })
@@ -58,7 +57,7 @@ export function returnList(data) {
 // 下一节点
 export function getNextFlowNode(data) {
   return request({
-    url: '/flowable/task/nextFlowNode',
+    url: '/workflow/task/nextFlowNode',
     method: 'post',
     data: data
   })
@@ -67,7 +66,7 @@ export function getNextFlowNode(data) {
 // 部署流程实例
 export function deployStart(deployId) {
   return request({
-    url: '/flowable/process/startFlow/' + deployId,
+    url: '/workflow/process/startFlow/' + deployId,
     method: 'get',
   })
 }