Browse Source

接口加上统一的参数 用户信息 来源

zhaojijng 2 years ago
parent
commit
a53109b226

+ 1 - 1
src/config/api.js

@@ -1,3 +1,3 @@
 export const BASE_PATH = '/api';
- export const projectId = 'Pj3301100002';
+ export const projectId = 'Pj3301100002';//之江
 //export  const projectId = 'Pj1101080259';

+ 39 - 30
src/services/ant-design-pro/environment.ts

@@ -4,19 +4,22 @@ import { projectId } from '@/config/api';
 import userData from '@/config/user';
 
 export async function getMapList(body: any, options?: { [key: string]: any }) {
-  return request<API.MapInfoRes>('/sgadmin/duoduo-service/setup-service/map/queryMapInfo', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
+  return request<API.MapInfoRes>(
+    `/sgadmin/duoduo-service/setup-service/map/queryMapInfo?${commonParams()}`,
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      ...(options || {}),
+      data: body,
     },
-    ...(options || {}),
-    data: body,
-  });
+  );
 }
 export async function getBuildingList(body: any, options?: { [key: string]: any }) {
   //debugger;
   return request<API.BuildFloorList>(
-    '/sgadmin/duoduo-service/object-service/object/building/query',
+    `/sgadmin/duoduo-service/object-service/object/building/query?${commonParams()}`,
     {
       method: 'POST',
       headers: {
@@ -29,19 +32,22 @@ export async function getBuildingList(body: any, options?: { [key: string]: any
 }
 export async function getFloorList(body: any, options?: { [key: string]: any }) {
   // debugger;
-  return request<API.BuildFloorList>('/sgadmin/duoduo-service/object-service/object/floor/query', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
+  return request<API.BuildFloorList>(
+    `/sgadmin/duoduo-service/object-service/object/floor/query?${commonParams()}`,
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      ...(options || {}),
+      data: body,
     },
-    ...(options || {}),
-    data: body,
-  });
+  );
 }
 export async function queryDeviceTimeManage(params: any, options?: { [key: string]: any }) {
   //  '/api3/duoduo-service/setup-service/deviceManage/queryDeviceTimeManage'
   return request<API.DeviceTimeType>(
-    '/sgadmin/duoduo-service/setup-service/deviceManage/queryDeviceTimeManage',
+    `/sgadmin/duoduo-service/setup-service/deviceManage/queryDeviceTimeManage?${commonParams()}`,
     {
       method: 'GET',
       params: {
@@ -60,9 +66,7 @@ function getProjectId() {
 function commonParams() {
   var userObj = userData.getInstance();
   const user = userObj.getUser();
-  return `openid=9a1ecfbacb6b4f249bf2dd3ec7793ead&pubname=sagacareAndtenantslink&projectId=${getProjectId()}&userName=${
-    user.name
-  }&userPhone=${user.phone}&userId=${user.id}`;
+  return `openid=${user.id}&pubname=sgadmin&projectId=${getProjectId()}&userId=${user.id}`;
 }
 // chart
 export async function queryPropertyData(params: any, options?: { [key: string]: any }) {
@@ -78,7 +82,9 @@ export async function queryPropertyData(params: any, options?: { [key: string]:
 export async function queryEnvironmentParam(body: any, otherParam: { [key: string]: any }) {
   //api/duoduo-service/object-service/object/floor/queryParam
   return request<API.EnvironmentParam>(
-    `/sgadmin/duoduo-service/object-service/object/floor/queryParam?endTime=${otherParam.endTime}&startTime=${otherParam.startTime}&param=${otherParam.param}`,
+    `/sgadmin/duoduo-service/object-service/object/floor/queryParam?endTime=${
+      otherParam.endTime
+    }&startTime=${otherParam.startTime}&param=${otherParam.param}&${commonParams()}`,
     {
       method: 'POST',
       headers: {
@@ -92,7 +98,7 @@ export async function queryEnvironmentParam(body: any, otherParam: { [key: strin
 export async function queryEquipStatistics(params: any, options?: { [key: string]: any }) {
   //
   return request<API.EnvironmentParam>(
-    `/sgadmin/duoduo-service/object-service/object/equipment/queryEquipStatistics`,
+    `/sgadmin/duoduo-service/object-service/object/equipment/queryEquipStatistics?${commonParams()}`,
     {
       method: 'GET',
       headers: {
@@ -109,7 +115,7 @@ export async function queryEquipStatistics(params: any, options?: { [key: string
 export async function querySpace(body: any, options?: { [key: string]: any }) {
   //
   return request<API.EnvironmentParam>(
-    `/sgadmin/duoduo-service/object-service/object/space/query`,
+    `/sgadmin/duoduo-service/object-service/object/space/query?${commonParams()}`,
     {
       method: 'POST',
       headers: {
@@ -122,18 +128,21 @@ export async function querySpace(body: any, options?: { [key: string]: any }) {
 }
 
 export async function checkToken(header: any, options?: { [key: string]: any }) {
-  return request<API.EnvironmentParam>(`/sgadmin/duoduo-service/setup-service/user/zjCheckToken`, {
-    method: 'GET',
-    headers: {
-      'Content-Type': 'application/json',
-      ...header,
+  return request<API.EnvironmentParam>(
+    `/sgadmin/duoduo-service/setup-service/user/zjCheckToken?${commonParams()}`,
+    {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        ...header,
+      },
+      ...(options || {}),
     },
-    ...(options || {}),
-  });
+  );
 }
 //http://10.100.28.79/sgadmin/sso//auth/zjFreshCheckToken
 export async function reFreshCheckToken(header: any, options?: { [key: string]: any }) {
-  return request<API.EnvironmentParam>(`/sgadmin/sso/auth/zjFreshCheckToken`, {
+  return request<API.EnvironmentParam>(`/sgadmin/sso/auth/zjFreshCheckToken?${commonParams()}`, {
     method: 'GET',
     headers: {
       'Content-Type': 'application/json',

+ 1 - 2
src/services/ant-design-pro/equipment.js

@@ -11,8 +11,7 @@ function getProjectId() {
 function commonParams() {
     var userObj = userData.getInstance();
      const user = userObj.getUser();
-    return `openid=9a1ecfbacb6b4f249bf2dd3ec7793ead&pubname=sagacareAndtenantslink&projectId=${getProjectId()}&userName=${user.name
-        }&userPhone=${user.phone}&userId=${user.id}`;
+    return `openid=${user.id}&pubname=sgadmin&projectId=${getProjectId()}&userId=${user.id}`;
 }