From 56e6ed3538bc164167d141d4ee6638263c8db575 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Mon, 27 Feb 2023 14:15:57 +0800 Subject: [PATCH] =?UTF-8?q?:rocket:=20=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/common/controller/pushFile.ts | 22 ++++++++++++++++ .../platform/common/controller/pushMessage.ts | 25 ++++++++++++++++++ .../common/controller/pushThirdPartyManage.ts | 25 ------------------ .../platform/common/entity/pushApplication.ts | 2 +- .../platform/common/entity/pushCustomType.ts | 8 +++--- src/api/platform/common/entity/pushFile.ts | 17 ++++++++++++ src/api/platform/common/entity/pushMessage.ts | 26 +++++++++++++++++++ .../platform/common/entity/pushPassList.ts | 4 +-- .../platform/common/entity/pushThirdParty.ts | 2 +- .../common/entity/pushThirdPartyManage.ts | 16 ------------ .../platform/common/entity/pushUserManage.ts | 16 ++++++------ 11 files changed, 106 insertions(+), 57 deletions(-) create mode 100644 src/api/platform/common/controller/pushFile.ts create mode 100644 src/api/platform/common/controller/pushMessage.ts delete mode 100644 src/api/platform/common/controller/pushThirdPartyManage.ts create mode 100644 src/api/platform/common/entity/pushFile.ts create mode 100644 src/api/platform/common/entity/pushMessage.ts delete mode 100644 src/api/platform/common/entity/pushThirdPartyManage.ts diff --git a/src/api/platform/common/controller/pushFile.ts b/src/api/platform/common/controller/pushFile.ts new file mode 100644 index 0000000..74191fd --- /dev/null +++ b/src/api/platform/common/controller/pushFile.ts @@ -0,0 +1,22 @@ +/** + * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 + * Copyright © 2020-2022 entfrm All rights reserved. + * author entfrm开发团队-王翔 + */ +import type { PushFileParams, PushFileResult } from '/@/api/platform/common/entity/pushFile'; +import { defHttp } from '/@/utils/http/axios'; +import { UploadFileParams } from '/#/axios'; +import { UploadResult } from '/@/api/platform/core/entity/upload'; + +enum Api { + list = '/common_proxy/common/pushFile/list', + upload = '/common_proxy/common/pushFile/upload', + del = '/common_proxy/common/pushFile/remove' +} + +export const listPushFile = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); + +export const commonUpload = (params: UploadFileParams, onUploadProgress: (progressEvent: ProgressEvent) => void) => + defHttp.uploadFile({ url: Api.upload, onUploadProgress }, params); + +export const delPushFile = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); diff --git a/src/api/platform/common/controller/pushMessage.ts b/src/api/platform/common/controller/pushMessage.ts new file mode 100644 index 0000000..e141f8f --- /dev/null +++ b/src/api/platform/common/controller/pushMessage.ts @@ -0,0 +1,25 @@ +/** + * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 + * Copyright © 2020-2022 entfrm All rights reserved. + * author entfrm开发团队-王翔 + */ +import type { PushMessageParams, PushMessageResult, PushMessage } from '/@/api/platform/common/entity/pushMessage'; +import { defHttp } from '/@/utils/http/axios'; + +enum Api { + list = '/common_proxy/common/pushMessage/list', + add = '/common_proxy/common/pushMessage/save', + get = '/common_proxy/common/pushMessage', + edit = '/common_proxy/common/pushMessage/update', + del = '/common_proxy/common/pushMessage/remove' +} + +export const listPushMessage = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); + +export const addPushMessage = (params: Partial) => defHttp.post({ url: Api.add, data: params }); + +export const editPushMessage = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); + +export const getPushMessage = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); + +export const delPushMessage = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); diff --git a/src/api/platform/common/controller/pushThirdPartyManage.ts b/src/api/platform/common/controller/pushThirdPartyManage.ts deleted file mode 100644 index 9d57690..0000000 --- a/src/api/platform/common/controller/pushThirdPartyManage.ts +++ /dev/null @@ -1,25 +0,0 @@ -/** - * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 - * Copyright © 2020-2022 entfrm All rights reserved. - * author entfrm开发团队-王翔 - */ -import type { PushThirdPartyManage, PushThirdPartyManageParams, PushThirdPartyManageResult } from '/@/api/platform/common/entity/pushThirdPartyManage'; -import { defHttp } from '/@/utils/http/axios'; - -enum Api { - list = '/common_proxy/common/pushThirdPartyManage/list', - add = '/common_proxy/common/pushThirdPartyManage/save', - get = '/common_proxy/common/pushThirdPartyManage', - edit = '/common_proxy/common/pushThirdPartyManage/update', - del = '/common_proxy/common/pushThirdPartyManage/remove', -} - -export const listPushThirdPartyManage = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); - -export const addPushThirdPartyManage = (params: Partial) => defHttp.post({ url: Api.add, data: params }); - -export const editPushThirdPartyManage = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); - -export const getPushThirdPartyManage = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); - -export const delPushThirdPartyManage = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); diff --git a/src/api/platform/common/entity/pushApplication.ts b/src/api/platform/common/entity/pushApplication.ts index e4798bc..51eea93 100644 --- a/src/api/platform/common/entity/pushApplication.ts +++ b/src/api/platform/common/entity/pushApplication.ts @@ -7,7 +7,7 @@ export interface PushApplication extends CommonEntity { id: string; name: string; status: string; - url: string; + ip: string; messageSecret: string; } diff --git a/src/api/platform/common/entity/pushCustomType.ts b/src/api/platform/common/entity/pushCustomType.ts index b66d5d6..ef51ee8 100644 --- a/src/api/platform/common/entity/pushCustomType.ts +++ b/src/api/platform/common/entity/pushCustomType.ts @@ -6,10 +6,10 @@ export type PushCustomTypeParams = Page & PushCustomType; export interface PushCustomType extends CommonEntity { id: string; name: string; - level: string; - isVibration: string; - isSound: string; - customSound: string; + playSound: string; + playVibrate: string; + playLights: string; + customPlayFileName: string; } export type PushCustomTypeResult = R; diff --git a/src/api/platform/common/entity/pushFile.ts b/src/api/platform/common/entity/pushFile.ts new file mode 100644 index 0000000..1e43530 --- /dev/null +++ b/src/api/platform/common/entity/pushFile.ts @@ -0,0 +1,17 @@ +import type { R } from '/#/axios'; +import type { CommonEntity, Page } from '/@/api/common/data/entity'; + +export type PushFileParams = Page & PushFile; + +export interface PushFile extends CommonEntity { + id: string; + fileUrl: string; + fileName: string; + bucketName: string; + original: string; + type: string; + fileSize: number; + [key: string]: any; +} + +export type PushFileResult = R; diff --git a/src/api/platform/common/entity/pushMessage.ts b/src/api/platform/common/entity/pushMessage.ts new file mode 100644 index 0000000..a1e880f --- /dev/null +++ b/src/api/platform/common/entity/pushMessage.ts @@ -0,0 +1,26 @@ +import type { R } from '/#/axios'; +import type { CommonEntity, Page } from '/@/api/common/data/entity'; + +export type PushMessageParams = Page & PushMessage; + +export interface PushMessage extends CommonEntity { + id: string; + fromUserId: string; + type: string; + customTypeId: string; + status: string; + aliasType: string; + alias: string; + displayType: string; + title: string; + text: string; + sound: string; + playVibrate: string; + playLights: string; + playSound: string; + customPlayFileName: string; + custom: string; + [key: string]: any; +} + +export type PushMessageResult = R; diff --git a/src/api/platform/common/entity/pushPassList.ts b/src/api/platform/common/entity/pushPassList.ts index 3049502..aaa3914 100644 --- a/src/api/platform/common/entity/pushPassList.ts +++ b/src/api/platform/common/entity/pushPassList.ts @@ -5,8 +5,8 @@ export type PushPassListParams = Page & PushPassList; export interface PushPassList extends CommonEntity { id: string; - pushManageId: string; - name: string; + fromPushId: string; + toPushId: string; type: string; } diff --git a/src/api/platform/common/entity/pushThirdParty.ts b/src/api/platform/common/entity/pushThirdParty.ts index a76a7e3..be9a989 100644 --- a/src/api/platform/common/entity/pushThirdParty.ts +++ b/src/api/platform/common/entity/pushThirdParty.ts @@ -7,7 +7,7 @@ export interface PushThirdParty extends CommonEntity { id: string; statutoryRepName: string; idCard: string; - enterpName: string; + entName: string; licenseFileId: string; phone: string; creditCode: string; diff --git a/src/api/platform/common/entity/pushThirdPartyManage.ts b/src/api/platform/common/entity/pushThirdPartyManage.ts deleted file mode 100644 index 16057d2..0000000 --- a/src/api/platform/common/entity/pushThirdPartyManage.ts +++ /dev/null @@ -1,16 +0,0 @@ -import type { R } from '/#/axios'; -import type { CommonEntity, Page } from '/@/api/common/data/entity'; - -export type PushThirdPartyManageParams = Page & PushThirdPartyManage; - -export interface PushThirdPartyManage extends CommonEntity { - id: string; - thirdPartyId: string; - enterpName: string; - pushTypeId: string; - isVibration: string; - isSound: string; - customSound: string; -} - -export type PushThirdPartyManageResult = R; diff --git a/src/api/platform/common/entity/pushUserManage.ts b/src/api/platform/common/entity/pushUserManage.ts index 3ce341e..540c878 100644 --- a/src/api/platform/common/entity/pushUserManage.ts +++ b/src/api/platform/common/entity/pushUserManage.ts @@ -5,14 +5,14 @@ export type PushUserManageParams = Page & PushUserManage; export interface PushUserManage extends CommonEntity { id: string; - userId: string; - nickName: string; - sex: string; - avatar: string; - pushTypeId: string; - isVibration: string; - isSound: string; - customSound: string; + toUserId: string; + fromUserId: string; + userName: string; + status: string; + playSound: string; + playVibrate: string; + playLights: string; + type: string; } export type PushUserManageResult = R;