Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edit

Browse Source
This commit is contained in:
Taric Xin
2022-04-12 17:06:27 +08:00
parent 82217dfc7b
commit 2cff827e3f
4 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/app/shared/services/core/base.service.ts
View File

@ -34,7 +34,7 @@ import { IBase } from '../../interfaces';
import { EAFileUtil } from '../../utils';
@Injectable({
providedIn: 'root',
providedIn: 'root'
})
export class BaseService implements IBase {
// 新增实例接口地址
@ -94,7 +94,7 @@ export class BaseService implements IBase {
parameter: any = {},
method: 'POST' | 'GET',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> {
if (paramType === 'FORM') {
parameter = this.getFormData(parameter);
@ -104,7 +104,7 @@ export class BaseService implements IBase {
return this.http
.request(method, url, {
body: paramInBody ? parameter : null,
params: paramInBody ? null : parameter,
params: paramInBody ? null : parameter
})
.pipe(
map((res: any) => {
@ -122,7 +122,7 @@ export class BaseService implements IBase {
this.msgSrv.warning(res.msg);
return allowBadCode ? res : null;
}
}),
})
);
}
@ -144,7 +144,7 @@ export class BaseService implements IBase {
parameter: any = {},
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> {
return this.httpRequest(url, parameter, method, paramInBody, paramType);
}
@ -154,7 +154,7 @@ export class BaseService implements IBase {
parameter: any = {},
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any> {
return this.request(url, parameter, method, paramInBody, paramType).toPromise();
}
@ -165,7 +165,7 @@ export class BaseService implements IBase {
url: string = this.$api_add_one,
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> {
return this.request(url, parameter, method, paramInBody, paramType);
}
@ -175,7 +175,7 @@ export class BaseService implements IBase {
url: string = this.$api_add_one,
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any> {
return this.addOne(parameter, url, method, paramInBody, paramType).toPromise();
}
@ -185,7 +185,7 @@ export class BaseService implements IBase {
url: string = this.$api_add_many,
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> {
return this.request(url, parameter, method, paramInBody, paramType);
}
@ -195,7 +195,7 @@ export class BaseService implements IBase {
url: string = this.$api_add_many,
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any> {
return this.addMany(parameter, url, method, paramInBody, paramType).toPromise();
}
@ -206,7 +206,7 @@ export class BaseService implements IBase {
url: string = this.$api_del_one,
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> {
return this.request(url, parameter, method, paramInBody, paramType);
}
@ -216,7 +216,7 @@ export class BaseService implements IBase {
url: string = this.$api_del_one,
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any> {
return this.delOne(parameter, url, method, paramInBody, paramType).toPromise();
}
@ -226,7 +226,7 @@ export class BaseService implements IBase {
url: string = this.$api_del_many,
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> {
return this.request(url, parameter, method, paramInBody, paramType);
}
@ -236,7 +236,7 @@ export class BaseService implements IBase {
url: string = this.$api_del_many,
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any> {
return this.delMany(parameter, url, method, paramInBody, paramType).toPromise();
}
@ -247,7 +247,7 @@ export class BaseService implements IBase {
url: string = this.$api_edit_one,
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> {
return this.request(url, parameter, method, paramInBody, paramType);
}
@ -257,7 +257,7 @@ export class BaseService implements IBase {
url: string = this.$api_edit_one,
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any> {
return this.updateOne(parameter, url, method, paramInBody, paramType).toPromise();
}
@ -267,7 +267,7 @@ export class BaseService implements IBase {
url: string = this.$api_edit_many,
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> {
return this.request(url, parameter, method, paramInBody, paramType);
}
@ -277,7 +277,7 @@ export class BaseService implements IBase {
url: string = this.$api_edit_many,
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any> {
return this.updateMany(parameter, url, method, paramInBody, paramType).toPromise();
}
@ -290,7 +290,7 @@ export class BaseService implements IBase {
url: string = this.$api_get_one,
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any> {
return this.request(url, parameter, method, paramInBody, paramType);
}
@ -300,7 +300,7 @@ export class BaseService implements IBase {
url: string = this.$api_get_one,
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any> {
return this.getOne(parameter, url, method, paramInBody, paramType).toPromise();
}
@ -313,12 +313,12 @@ export class BaseService implements IBase {
url: string = this.$api_get_many,
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Observable<any[]> {
return this.httpRequest(url, parameter, method, paramInBody, paramType).pipe(
map((res) => {
map(res => {
return (res as any[]) || [];
}),
})
);
}
@ -327,7 +327,7 @@ export class BaseService implements IBase {
url: string = this.$api_get_many,
method: 'POST' | 'GET' = 'POST',
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
paramType: 'JSON' | 'FORM' = 'JSON'
): Promise<any[]> {
return this.getMany(parameter, url, method, paramInBody, paramType).toPromise();
}
@ -352,19 +352,19 @@ export class BaseService implements IBase {
paramInBody: boolean = true,
paramType: 'JSON' | 'FORM' = 'JSON',
allowBadCode: boolean = true,
async: boolean = true,
async: boolean = true
): Observable<any> | Promise<any> {
if (allowBadCode) {
url += `?_allow_badcode=true`;
}
const response = this.httpRequest(url, parameter, method, paramInBody, paramType).pipe(
tap((res) => {
tap(res => {
if (res.success) {
this.msgSrv.success(`创建下载任务成功，请前往下载任务列表下载您的文件！`);
window.open('#/download');
}
return res;
}),
})
);
return async ? response.toPromise() : response;
}
@ -396,11 +396,15 @@ export class BaseService implements IBase {
this.msgSrv.warning(m.msg);
return false;
}
}),
})
)
.toPromise();
}
openURL(url: string) {
window.open(url);
}
/**
* 直接下载文件
*/
@ -464,19 +468,19 @@ export class BaseService implements IBase {
*/
getDict(key: string): Observable<any[]> {
return this.http.post(this.$api_get_dict, { dict: key }).pipe(
map((res) => {
map(res => {
if (res.success === true) {
return res.data.map((r: any) => {
return {
label: r.itemValue,
value: r.itemKey,
value: r.itemKey
};
});
} else {
this.msgSrv.warning(`获取取字典【${key}】时发生错误：${res.msg || '未知错误！'}`);
return [];
}
}),
})
);
}
@ -508,7 +512,7 @@ export class BaseService implements IBase {
if (paramsIndex > -1) {
const paramsStr = url.substr(paramsIndex + 1);
const params = paramsStr.split('&');
const keyMap = params.find((e) => e.includes(paramName));
const keyMap = params.find(e => e.includes(paramName));
const value = keyMap ? keyMap.split('=')[1] : '';
return value;
}