diff --git a/src/api/infra/apiMqDetail/index.ts b/src/api/infra/apiMqDetail/index.ts deleted file mode 100644 index dc76f3616..000000000 --- a/src/api/infra/apiMqDetail/index.ts +++ /dev/null @@ -1,55 +0,0 @@ -import request from '@/config/axios' - -export interface ApiMqDetailVO { - id: number - masterId: number - number: string - type: string - content: string - times: number - available: string - departmentCode: string - extraProperties: string - siteId: string -} - -// 查询mq执行记录子列表 -export const getApiMqDetailPage = async (params) => { - if (params.isSearch) { - delete params.isSearch - const data = {...params} - return await request.post({ url: '/infra/api-mq-detail/senior', data }) - } else { - return await request.get({ url: `/infra/api-mq-detail/page`, params }) - } -} - -// 查询mq执行记录子详情 -export const getApiMqDetail = async (id: number) => { - return await request.get({ url: `/infra/api-mq-detail/get?id=` + id }) -} - -// 新增mq执行记录子 -export const createApiMqDetail = async (data: ApiMqDetailVO) => { - return await request.post({ url: `/infra/api-mq-detail/create`, data }) -} - -// 修改mq执行记录子 -export const updateApiMqDetail = async (data: ApiMqDetailVO) => { - return await request.put({ url: `/infra/api-mq-detail/update`, data }) -} - -// 删除mq执行记录子 -export const deleteApiMqDetail = async (id: number) => { - return await request.delete({ url: `/infra/api-mq-detail/delete?id=` + id }) -} - -// 导出mq执行记录子 Excel -export const exportApiMqDetail = async (params) => { - return await request.download({ url: `/infra/api-mq-detail/export-excel`, params }) -} - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/infra/api-mq-detail/get-import-template' }) -} \ No newline at end of file diff --git a/src/api/infra/apiMqError/index.ts b/src/api/infra/apiMqError/index.ts new file mode 100644 index 000000000..a29aa9bbc --- /dev/null +++ b/src/api/infra/apiMqError/index.ts @@ -0,0 +1,55 @@ +import request from '@/config/axios' + +export interface ApiMqErrorVO { + id: number + number: string + type: string + content: string + times: number + available: string + departmentCode: string + extraProperties: string + siteId: string + concurrencyStamp: number +} + +// 查询mq执行异常记录列表 +export const getApiMqErrorPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/infra/api-mq-error/senior', data }) + } else { + return await request.get({ url: `/infra/api-mq-error/page`, params }) + } +} + +// 查询mq执行异常记录详情 +export const getApiMqError = async (id: number) => { + return await request.get({ url: `/infra/api-mq-error/get?id=` + id }) +} + +// 新增mq执行异常记录 +export const createApiMqError = async (data: ApiMqErrorVO) => { + return await request.post({ url: `/infra/api-mq-error/create`, data }) +} + +// 修改mq执行异常记录 +export const updateApiMqError = async (data: ApiMqErrorVO) => { + return await request.put({ url: `/infra/api-mq-error/update`, data }) +} + +// 删除mq执行异常记录 +export const deleteApiMqError = async (id: number) => { + return await request.delete({ url: `/infra/api-mq-error/delete?id=` + id }) +} + +// 导出mq执行异常记录 Excel +export const exportApiMqError = async (params) => { + return await request.download({ url: `/infra/api-mq-error/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/infra/api-mq-error/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/infra/apiMqHis/index.ts b/src/api/infra/apiMqHis/index.ts new file mode 100644 index 000000000..3d7ed469d --- /dev/null +++ b/src/api/infra/apiMqHis/index.ts @@ -0,0 +1,54 @@ +import request from '@/config/axios' + +export interface ApiMqHisVO { + id: number + number: string + type: string + times: number + available: string + departmentCode: string + extraProperties: string + siteId: string + concurrencyStamp: number +} + +// 查询mq执行历史记录列表 +export const getApiMqHisPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/infra/api-mq-his/senior', data }) + } else { + return await request.get({ url: `/infra/api-mq-his/page`, params }) + } +} + +// 查询mq执行历史记录详情 +export const getApiMqHis = async (id: number) => { + return await request.get({ url: `/infra/api-mq-his/get?id=` + id }) +} + +// 新增mq执行历史记录 +export const createApiMqHis = async (data: ApiMqHisVO) => { + return await request.post({ url: `/infra/api-mq-his/create`, data }) +} + +// 修改mq执行历史记录 +export const updateApiMqHis = async (data: ApiMqHisVO) => { + return await request.put({ url: `/infra/api-mq-his/update`, data }) +} + +// 删除mq执行历史记录 +export const deleteApiMqHis = async (id: number) => { + return await request.delete({ url: `/infra/api-mq-his/delete?id=` + id }) +} + +// 导出mq执行历史记录 Excel +export const exportApiMqHis = async (params) => { + return await request.download({ url: `/infra/api-mq-his/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/infra/api-mq-his/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/infra/apiMqMain/index.ts b/src/api/infra/apiMqMain/index.ts deleted file mode 100644 index 1f8d2de80..000000000 --- a/src/api/infra/apiMqMain/index.ts +++ /dev/null @@ -1,53 +0,0 @@ -import request from '@/config/axios' - -export interface ApiMqMainVO { - id: number - number: string - type: string - times: number - available: string - departmentCode: string - extraProperties: string - siteId: string -} - -// 查询mq执行记录主列表 -export const getApiMqMainPage = async (params) => { - if (params.isSearch) { - delete params.isSearch - const data = {...params} - return await request.post({ url: '/infra/api-mq-main/senior', data }) - } else { - return await request.get({ url: `/infra/api-mq-main/page`, params }) - } -} - -// 查询mq执行记录主详情 -export const getApiMqMain = async (id: number) => { - return await request.get({ url: `/infra/api-mq-main/get?id=` + id }) -} - -// 新增mq执行记录主 -export const createApiMqMain = async (data: ApiMqMainVO) => { - return await request.post({ url: `/infra/api-mq-main/create`, data }) -} - -// 修改mq执行记录主 -export const updateApiMqMain = async (data: ApiMqMainVO) => { - return await request.put({ url: `/infra/api-mq-main/update`, data }) -} - -// 删除mq执行记录主 -export const deleteApiMqMain = async (id: number) => { - return await request.delete({ url: `/infra/api-mq-main/delete?id=` + id }) -} - -// 导出mq执行记录主 Excel -export const exportApiMqMain = async (params) => { - return await request.download({ url: `/infra/api-mq-main/export-excel`, params }) -} - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/infra/api-mq-main/get-import-template' }) -} \ No newline at end of file diff --git a/src/views/infra/apiMqMain/apiMqMain.data.ts b/src/views/infra/apiMqError/apiMqError.data.ts similarity index 52% rename from src/views/infra/apiMqMain/apiMqMain.data.ts rename to src/views/infra/apiMqError/apiMqError.data.ts index 97ba03ed6..edc1c7467 100644 --- a/src/views/infra/apiMqMain/apiMqMain.data.ts +++ b/src/views/infra/apiMqError/apiMqError.data.ts @@ -2,16 +2,16 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' // 表单校验 -export const ApiMqMainRules = reactive({ +export const ApiMqErrorRules = reactive({ number: [required], type: [required], times: [required] }) -export const ApiMqMain = useCrudSchemas(reactive([ +export const ApiMqError = useCrudSchemas(reactive([ { - label: '业务编号', + label: '编号', field: 'number', sort: 'custom', isSearch: true @@ -21,37 +21,50 @@ export const ApiMqMain = useCrudSchemas(reactive([ field: 'type', sort: 'custom', isSearch: true, - form: { - component: 'SelectV2' - } + form: { + component: 'SelectV2' + } }, { - label: '执行次数', - field: 'times', + label: '内容', + field: 'content', sort: 'custom', isSearch: true, form: { - component: 'InputNumber', - value: 0 + component: 'Editor', + componentProps: { + valueHtml: '', + height: 200 + } } }, { - label: '是否可用', - field: 'available', + label: '执行次数', + field: 'times', sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 isSearch: true, form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } + component: 'InputNumber', + value: 0 } }, // { + // label: '是否可用', + // field: 'available', + // sort: 'custom', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // isSearch: true, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, + // { // label: '部门', // field: 'departmentCode', // sort: 'custom', @@ -73,17 +86,27 @@ export const ApiMqMain = useCrudSchemas(reactive([ }, isForm: false }, + // // { + // // label: '扩展属性', + // // field: 'extraProperties', + // // sort: 'custom', + // // isSearch: true + // // }, + // // { + // // label: '地点ID', + // // field: 'siteId', + // // sort: 'custom', + // // isSearch: true + // // }, // { - // label: '扩展属性', - // field: 'extraProperties', + // label: '乐观锁', + // field: 'concurrencyStamp', // sort: 'custom', - // isSearch: true - // }, - // { - // label: '地点ID', - // field: 'siteId', - // sort: 'custom', - // isSearch: true + // isSearch: true, + // form: { + // component: 'InputNumber', + // value: 0 + // } // }, // { // label: '操作', diff --git a/src/views/infra/apiMqDetail/index.vue b/src/views/infra/apiMqError/index.vue similarity index 75% rename from src/views/infra/apiMqDetail/index.vue rename to src/views/infra/apiMqError/index.vue index 6b84fb9a7..e62adac0e 100644 --- a/src/views/infra/apiMqDetail/index.vue +++ b/src/views/infra/apiMqError/index.vue @@ -1,7 +1,7 @@ diff --git a/src/views/infra/apiMqDetail/apiMqDetail.data.ts b/src/views/infra/apiMqHis/apiMqHis.data.ts similarity index 59% rename from src/views/infra/apiMqDetail/apiMqDetail.data.ts rename to src/views/infra/apiMqHis/apiMqHis.data.ts index 75b51568e..049afc60d 100644 --- a/src/views/infra/apiMqDetail/apiMqDetail.data.ts +++ b/src/views/infra/apiMqHis/apiMqHis.data.ts @@ -2,17 +2,21 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' // 表单校验 -export const ApiMqDetailRules = reactive({ - masterId: [required], +export const ApiMqHisRules = reactive({ number: [required], type: [required], times: [required] }) -export const ApiMqDetail = useCrudSchemas(reactive([ - +export const ApiMqHis = useCrudSchemas(reactive([ + // { + // label: '编号', + // field: 'id', + // sort: 'custom', + // isForm: false + // }, { - label: '主业务编号编号', + label: '编号', field: 'number', sort: 'custom', isSearch: true @@ -27,20 +31,7 @@ export const ApiMqDetail = useCrudSchemas(reactive([ } }, { - label: '内容', - field: 'content', - sort: 'custom', - isSearch: true, - form: { - component: 'Editor', - componentProps: { - valueHtml: '', - height: 200 - } - } - }, - { - label: '执行次数(默认1)', + label: '执行次数', field: 'times', sort: 'custom', isSearch: true, @@ -49,14 +40,22 @@ export const ApiMqDetail = useCrudSchemas(reactive([ value: 0 } }, - { - label: '是否可用', - field: 'available', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: true - }, + // { + // label: '是否可用', + // field: 'available', + // sort: 'custom', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // isSearch: true, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, // { // label: '部门', // field: 'departmentCode', @@ -92,6 +91,16 @@ export const ApiMqDetail = useCrudSchemas(reactive([ // isSearch: true // }, // { + // label: '乐观锁', + // field: 'concurrencyStamp', + // sort: 'custom', + // isSearch: true, + // form: { + // component: 'InputNumber', + // value: 0 + // } + // }, + // { // label: '操作', // field: 'action', // isForm: false, diff --git a/src/views/infra/apiMqMain/index.vue b/src/views/infra/apiMqHis/index.vue similarity index 67% rename from src/views/infra/apiMqMain/index.vue rename to src/views/infra/apiMqHis/index.vue index 14547b46c..c8f647cfc 100644 --- a/src/views/infra/apiMqMain/index.vue +++ b/src/views/infra/apiMqHis/index.vue @@ -1,7 +1,7 @@