Browse Source

增加打印,调试api

dev
刘向辉 3 years ago
parent
commit
f9e49cbc37
  1. 2
      src/app/babylon/controller/serve-manager.ts
  2. 2
      src/app/babylon/controller/status/login-status.ts
  3. 22
      src/app/http-interceptors/base-interceptor.ts
  4. 2
      src/app/pages/plan/plan.component.ts

2
src/app/babylon/controller/serve-manager.ts

@ -51,7 +51,7 @@ export class ServeManager {
) => void, onError?: (key: string, error: string) => void) { ) => void, onError?: (key: string, error: string) => void) {
let data = classToPlain(institutionData); let data = classToPlain(institutionData);
console.log(data); console.log("保存单位", data);
this.buildingBISrv.postBuildingBasicInfos(key, data) this.buildingBISrv.postBuildingBasicInfos(key, data)
.subscribe(data => { .subscribe(data => {
ModeManager.log("保存单位成功:" + key); ModeManager.log("保存单位成功:" + key);

2
src/app/babylon/controller/status/login-status.ts

@ -38,6 +38,7 @@ export class LoginSatus extends StatusBase {
console.error("创建单位key为null"); console.error("创建单位key为null");
return; return;
} }
console.log("创建单位");
let insData = new InstitutionData(); let insData = new InstitutionData();
insData.normalData = new NormalData(key, name); insData.normalData = new NormalData(key, name);
@ -222,6 +223,7 @@ export class LoginSatus extends StatusBase {
//保存新单位信息至服务器 //保存新单位信息至服务器
saveNewIns(status: LoginSatus, insData: InstitutionData, key: string, onSuccess?: (insDataSimple: InsitutionDataSimple) => void) { saveNewIns(status: LoginSatus, insData: InstitutionData, key: string, onSuccess?: (insDataSimple: InsitutionDataSimple) => void) {
console.log("准备保存新单位");
ServeManager.instance.saveInstitutionData(insData, key, (key, result) => { ServeManager.instance.saveInstitutionData(insData, key, (key, result) => {
console.log("在服务器新建单位" + key); console.log("在服务器新建单位" + key);
let insDataSimple = new InsitutionDataSimple(); let insDataSimple = new InsitutionDataSimple();

22
src/app/http-interceptors/base-interceptor.ts

@ -5,8 +5,8 @@ import {
} from '@angular/common/http'; } from '@angular/common/http';
import { throwError } from 'rxjs' import { throwError } from 'rxjs'
import { catchError, retry } from 'rxjs/operators'; import { catchError, retry } from 'rxjs/operators';
import { Router,ActivatedRoute } from '@angular/router' import { Router, ActivatedRoute } from '@angular/router'
import {CacheTokenService} from '../service/cache-token.service' import { CacheTokenService } from '../service/cache-token.service'
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
import { CookieService } from 'ngx-cookie-service'; import { CookieService } from 'ngx-cookie-service';
@ -16,20 +16,20 @@ import { CookieService } from 'ngx-cookie-service';
@Injectable() @Injectable()
export class BaseInterceptor implements HttpInterceptor { export class BaseInterceptor implements HttpInterceptor {
constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,public token:CacheTokenService, constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, public token: CacheTokenService,
public snackBar: MatSnackBar,private cookieService: CookieService) {} public snackBar: MatSnackBar, private cookieService: CookieService) { }
intercept(req, next: HttpHandler) { intercept(req, next: HttpHandler) {
let newReq = req.clone({ let newReq = req.clone({
url: req.hadBaseurl ? `${req.url}` : `${req.url}`, url: req.hadBaseurl ? `${req.url}` : `${req.url}`,
}); });
if(!req.cancelToken) { if (!req.cancelToken) {
/*获取token*/ /*获取token*/
let token = this.cookieService.get("token") let token = this.cookieService.get("token")
/*此处设置额外请求头,token令牌*/ /*此处设置额外请求头,token令牌*/
newReq.headers = newReq.headers =
newReq.headers.set('Authorization', `Bearer ${token}`) newReq.headers.set('Authorization', `Bearer ${token}`)
} }
// 携带请求头发送下一次请求 // 携带请求头发送下一次请求
@ -45,12 +45,12 @@ export class BaseInterceptor implements HttpInterceptor {
private handleError(error: HttpErrorResponse) { private handleError(error: HttpErrorResponse) {
// 用户认证失败返回登录页 // 用户认证失败返回登录页
if (error.status === 401||error.status === 614) { if (error.status === 401 || error.status === 614) {
this.token.delete() this.token.delete()
sessionStorage.clear() sessionStorage.clear()
window.localStorage.clear() window.localStorage.clear()
this.cookieService.set("token",'',new Date(new Date().getTime() + 1),'/') this.cookieService.set("token", '', new Date(new Date().getTime() + 1), '/')
this.cookieService.set("refreshToken",'',new Date(new Date().getTime() + 1),'/') this.cookieService.set("refreshToken", '', new Date(new Date().getTime() + 1), '/')
this.snackBar.open('用户认证信息过期,请重新登录', '确定', { this.snackBar.open('用户认证信息过期,请重新登录', '确定', {
duration: 3000 duration: 3000
}); });
@ -65,7 +65,7 @@ export class BaseInterceptor implements HttpInterceptor {
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('请核对您的输入格式是否正确','确定',config); this.snackBar.open('请核对您的输入格式是否正确', '确定', config);
} }
if (error.error instanceof ErrorEvent) { if (error.error instanceof ErrorEvent) {
@ -80,6 +80,6 @@ export class BaseInterceptor implements HttpInterceptor {
} }
// 返回带有面向用户的错误信息 // 返回带有面向用户的错误信息
return throwError( return throwError(
error.error); error);
}; };
} }

2
src/app/pages/plan/plan.component.ts

@ -38,10 +38,12 @@ export class PlanComponent implements OnInit {
let key = 'ceshi'; let key = 'ceshi';
let find = data.find(item => { return item.key === key }) let find = data.find(item => { return item.key === key })
if (find) { //如果在data中找到了对应的单位key,则表示已经有三维数据,直接进入 if (find) { //如果在data中找到了对应的单位key,则表示已经有三维数据,直接进入
console.log("找到已有单位" + key);
this.beforeOneSatus = StatusManager.getStatus<LoginSatus>(LoginSatus); this.beforeOneSatus = StatusManager.getStatus<LoginSatus>(LoginSatus);
this.beforeOneSatus.onSelectInsSuccess(find) this.beforeOneSatus.onSelectInsSuccess(find)
} else { //如果没有找到对应的单位key,则调用新建单位 } else { //如果没有找到对应的单位key,则调用新建单位
let name = 'ceshi'; let name = 'ceshi';
console.log("没找到单位,新建" + key);
loginStatus.createInsitution(key, name); loginStatus.createInsitution(key, name);
} }
} else { } else {

Loading…
Cancel
Save