Browse Source

proxy 代理的修改 改成线上服务

zhaojijng 2 years ago
parent
commit
0be8e5c40f

+ 4 - 31
config/proxy.ts

@@ -9,14 +9,6 @@
 export default {
   dev: {
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
-    '/api/': {
-      // 要代理的地址
-      target: 'http://192.168.0.14:52015/',
-      // 配置了这个可以从 http 代理到 https
-      // 依赖 origin 的功能可能需要这个,比如 cookie
-      changeOrigin: true,
-      pathRewrite: { '^/api': '' },
-    },
     '/server/': {
       // 要代理的地址
       target: 'https://duoduoenv.sagacloud.cn/',
@@ -27,40 +19,21 @@ export default {
     },
     '/api2/': {
       // 要代理的地址
-      target: 'http://192.168.0.14:52010/',
+      //target: 'http://192.168.0.14:52010/',
+      target: 'http://api.sagacloud.cn/',
       // 配置了这个可以从 http 代理到 https
       // 依赖 origin 的功能可能需要这个,比如 cookie
       changeOrigin: true,
       pathRewrite: { '^/api2': '' },
     },
-    '/duoduo-service': {
+    '/api': {
       target: 'https://duoduoenv.sagacloud.cn/',
       // target: 'http://192.168.12.13:52011/',
       changeOrigin: true,
       pathRewrite: {
-        // "^/apis": ""
+        '^/api': '',
       },
     },
-    // '/api3/': {
-    //   // 要代理的地址
-    //   //target: 'http://api.sagacloud.cn/',
-    //   target: 'http://192.168.0.65:52015/',
-
-    //   // 配置了这个可以从 http 代理到 https
-    //   // 依赖 origin 的功能可能需要这个,比如 cookie
-    //   changeOrigin: true,
-    //   pathRewrite: { '^/api3': '' },
-    // },
-    '/api4/': {
-      // 要代理的地址
-      //target: 'http://api.sagacloud.cn/',
-      target: 'http://api.sagacloud.cn/',
-
-      // 配置了这个可以从 http 代理到 https
-      // 依赖 origin 的功能可能需要这个,比如 cookie
-      changeOrigin: true,
-      pathRewrite: { '^/api4': '' },
-    },
   },
   test: {
     '/api/': {

+ 41 - 10
src/pages/Equipment/components/topNavRight/index.tsx

@@ -8,15 +8,21 @@ import styles from './index.less';
 import type { navigatorItem } from '@/pages/Environment/index';
 
 import { useModel } from 'umi';
-import { changeCurtain, changeAllAir, changeLight } from '@/pages/Equipment/equipmentControl.js';
+import { changeCurtain, changeAllAir, changeLight } from '@/pages/Equipment/equipmentControl';
 
 export type topNavRightProps = {
   selNavObj: navigatorItem;
   navigatorList: navigatorItem[];
   mapList: API.MapInfo[];
+  queryDeviceManage: () => void;
 };
 
-const TopNavRight: React.FC<topNavRightProps> = ({ selNavObj, navigatorList, mapList }) => {
+const TopNavRight: React.FC<topNavRightProps> = ({
+  selNavObj,
+  navigatorList,
+  mapList,
+  queryDeviceManage,
+}) => {
   //const [modalvisible, setModalvisible] = useState<boolean>(false);
   //去掉全部设备的 设备列表
   const { projectId } = useModel('spaceFunc');
@@ -40,16 +46,28 @@ const TopNavRight: React.FC<topNavRightProps> = ({ selNavObj, navigatorList, map
         var filterSpaceArr = mapList.filter((item) => {
           return item[selNavObj.id] !== 1;
         });
-        return;
+        var filterSpaceArr2 = filterSpaceArr.filter((item) => {
+          return item.localName == '图书休闲区' || item.localName == '上格云3';
+        });
+        console.log('开启filterSpaceArr', filterSpaceArr2);
+        function getDeviceStatus() {
+          var interval = setInterval(() => {
+            queryDeviceManage();
+          }, 1000);
+          setTimeout(() => {
+            console.log('setTimeout');
+            clearInterval(interval);
+          }, 60000);
+        }
         //如果是空调
         if (selNavObj.id == 'airConditioner') {
-          changeAllAir(filterSpaceArr, () => {}, '打开');
+          changeAllAir(filterSpaceArr2, getDeviceStatus, '打开', projectId);
         }
         if (selNavObj.id == 'light') {
-          changeLight('all', filterSpaceArr, () => {}, '打开');
+          changeLight('all', filterSpaceArr2, getDeviceStatus, '打开');
         }
         if (selNavObj.id == 'curtain') {
-          changeCurtain('all', filterSpaceArr, () => {}, '打开'); // '关闭' : '打开';
+          changeCurtain('all', filterSpaceArr2, getDeviceStatus, '打开'); // '关闭' : '打开';
         }
       },
       onCancel() {
@@ -71,16 +89,29 @@ const TopNavRight: React.FC<topNavRightProps> = ({ selNavObj, navigatorList, map
         var filterSpaceArr = mapList.filter((item) => {
           return item[selNavObj.id] !== 0;
         });
-        return;
+        var filterSpaceArr2 = filterSpaceArr.filter((item) => {
+          return item.localName == '图书休闲区' || item.localName == '上格云3';
+        });
+        console.log('关闭filterSpaceArr', filterSpaceArr2);
+        //return;
+        function getDeviceStatus() {
+          var interval = setInterval(() => {
+            queryDeviceManage();
+          }, 1000);
+          setTimeout(() => {
+            console.log('setTimeout');
+            clearInterval(interval);
+          }, 60000);
+        }
         //如果是空调
         if (selNavObj.id == 'airConditioner') {
-          changeAllAir(filterSpaceArr, () => {}, '打开');
+          changeAllAir(filterSpaceArr2, getDeviceStatus, '打开', projectId);
         }
         if (selNavObj.id == 'light') {
-          changeLight('all', filterSpaceArr, () => {}, '关闭');
+          changeLight('all', filterSpaceArr2, getDeviceStatus, '关闭');
         }
         if (selNavObj.id == 'curtain') {
-          changeCurtain('all', filterSpaceArr, () => {}, '关闭');
+          changeCurtain('all', filterSpaceArr2, getDeviceStatus, '关闭');
         }
       },
       onCancel() {

+ 79 - 76
src/pages/Equipment/equipmentControl.js

@@ -1,97 +1,100 @@
-import { changeAllAirHttp, changeAirHttp, setEquipeHttp, setallLampHttp, getStatusHttp } from '@/services/ant-design-pro/equipment';
+import { FormattedMessage, useModel } from 'umi';
+
+import {
+  changeAllAirHttp,
+  changeAirHttp,
+  setEquipeHttp,
+  setallLampHttp,
+  getStatusHttp,
+} from '@/services/ant-design-pro/equipment';
+
 import { Spin, Modal, message } from 'antd';
 import { setallLamps } from '@/pages/Equipment/checLampStatus.js';
 
-
 export const changeLight = (type, itemarr, callback, status) => {
-    const setType = status === '打开' ? true : false; // 10关闭 12开启
-    var paramsArr = [];
-    debugger;
-    itemarr.forEach((citem) => {
-        citem.equipList.forEach((item) => {
-            if (item.equipType == 'light') {
-                paramsArr.push({
-                    id: item.id,
-                    switch: setType,
-                });
-            }
+  const setType = status === '打开' ? true : false; // 10关闭 12开启
+  var paramsArr = [];
+  debugger;
+  itemarr.forEach((citem) => {
+    citem.equipList.forEach((item) => {
+      if (item.equipType == 'light') {
+        paramsArr.push({
+          id: item.id,
+          switch: setType,
         });
-    })
-
+      }
+    });
+  });
 
-    setallLamps(paramsArr, callback);
+  setallLamps(paramsArr, callback);
 };
 
 //窗帘的调节      0是关闭 1 是开启  2 是部分开启
 export const changeCurtain = (type, itemarr, callback, status) => {
-    debugger;
-    const setType = status === '打开' ? 'EquipOnSet' : 'EquipOffSet';
-    var paramsArr = [];
-    itemarr.forEach((citem) => {
-        citem.equipList.forEach((item) => {
-            if (item.equipType == 'curtain') {
-                paramsArr.push({
-                    equipmentCategory: 'CFSSES',
-                    infoCode: setType,
-                    value: 1,
-                    objectId: item.id,
-                });
-            }
+  debugger;
+  const setType = status === '打开' ? 'EquipOnSet' : 'EquipOffSet';
+  var paramsArr = [];
+  itemarr.forEach((citem) => {
+    citem.equipList.forEach((item) => {
+      if (item.equipType == 'curtain') {
+        paramsArr.push({
+          equipmentCategory: 'CFSSES',
+          infoCode: setType,
+          value: 1,
+          objectId: item.id,
         });
+      }
     });
+  });
 
-    console.log(citem);
-    console.log(paramsArr);
-
-    //发送指令
-    setEquipeHttp(paramsArr);
-    //这是在手动改变状态
-    callback();
-
+  //发送指令
+  setEquipeHttp(paramsArr);
+  //这是在手动改变状态
+  callback();
 };
 
 //空调的调节      0是关闭 1 是开启  2 是部分开启
 export const changeAir = (sitem, index, callback) => {
-    const itemId = sitem.airConditioner === 0 ? 12 : 10; // 10关闭 12开启
-    const paramsObj = {
-        objectId: sitem.id, // 空间id
-        valueType: 1, // 固定为1 1
-        itemId: itemId,
-    };
-    changeAirHttp(paramsObj).then((res) => {
-        if (res.result == 'success') {
-            message.success('指令下发成功');
-            // // sitem.airConditioner = res.isClose ? 0 : 1; //改变某空间空调的状态
-            // //mapCombineList[index]['airConditioner'] = res.isClose ? 0 : 1;
-            // var mapCopy = JSON.parse(JSON.stringify(mapCombineList));
-            // mapCopy[index]['airConditioner'] = res.isClose ? 0 : 1;
-            // setMapCombineList(mapCopy);
-            callback();
-        } else {
-            message.error('操作失败,请重试');
-        }
-    });
+  const itemId = sitem.airConditioner === 0 ? 12 : 10; // 10关闭 12开启
+  const paramsObj = {
+    objectId: sitem.id, // 空间id
+    valueType: 1, // 固定为1 1
+    itemId: itemId,
+  };
+  changeAirHttp(paramsObj).then((res) => {
+    if (res.result == 'success') {
+      message.success('指令下发成功');
+      // // sitem.airConditioner = res.isClose ? 0 : 1; //改变某空间空调的状态
+      // //mapCombineList[index]['airConditioner'] = res.isClose ? 0 : 1;
+      // var mapCopy = JSON.parse(JSON.stringify(mapCombineList));
+      // mapCopy[index]['airConditioner'] = res.isClose ? 0 : 1;
+      // setMapCombineList(mapCopy);
+      callback();
+    } else {
+      message.error('操作失败,请重试');
+    }
+  });
 };
-export const changeAllAir = (itemarr, callback, status) => {
-    let paramsArr = [];
-    debugger;
-    itemarr.forEach((sitem) => {
-        const itemId = status === '打开' ? 12 : 10; // 10关闭 12开启
-        paramsArr.push({
-            projectId: projectId,
-            objectId: sitem.id, // 空间id
-            valueType: 1, // 固定为1 1
-            itemId: itemId,
-        });
+export const changeAllAir = (itemarr, callback, status, projectId) => {
+  let paramsArr = [];
+  debugger;
+  itemarr.forEach((sitem) => {
+    const itemId = status === '打开' ? 12 : 10; // 10关闭 12开启
+    paramsArr.push({
+      projectId: projectId,
+      objectId: sitem.id, // 空间id
+      valueType: 1, // 固定为1 1
+      itemId: itemId,
     });
+  });
 
-    changeAllAirHttp(paramsArr).then((res) => {
-        debugger;
-        if (res.result == 'success') {
-            message.success('指令下发成功');
-            callback();
-        } else {
-            message.error('操作失败,请重试');
-        }
-    });
+  changeAllAirHttp(paramsArr).then((res) => {
+    debugger;
+    if (res.result == 'success') {
+      message.success('指令下发成功');
+      callback();
+    } else {
+      message.error('操作失败,请重试');
+    }
+  });
 };

+ 6 - 11
src/pages/Equipment/index.tsx

@@ -23,7 +23,7 @@ import {
   queryDeviceTimeManage,
 } from '@/services/ant-design-pro/environment';
 
-import { changeCurtain, changeAir, changeLight } from '@/pages/Equipment/equipmentControl.js';
+import { changeCurtain, changeAir, changeLight } from '@/pages/Equipment/equipmentControl';
 
 //设备状态
 type equipStatus = {
@@ -162,7 +162,7 @@ const Environment: React.FC = () => {
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        function getLamp() {
+        function getDeviceStatus() {
           var interval = setInterval(() => {
             queryDeviceManage();
           }, 1000);
@@ -173,18 +173,13 @@ const Environment: React.FC = () => {
         }
         //如果是空调
         if (selNav.id == 'airConditioner') {
-          changeAir(item, index, getLamp);
+          changeAir(item, index, getDeviceStatus);
         }
         if (selNav.id == 'light') {
-          changeLight('one', [item], getLamp, status);
+          changeLight('one', [item], getDeviceStatus, status);
         }
         if (selNav.id == 'curtain') {
-          //   function getLamp() {
-          //     var mapCopy = JSON.parse(JSON.stringify(mapCombineList));
-          //     mapCopy[index]['curtain'] = item.curtain === 1 ? 0 : 1;
-          //     setMapCombineList(mapCopy);
-          //   }
-          changeCurtain('one', [item], () => {}, status);
+          changeCurtain('one', [item], getDeviceStatus, status);
         }
         debugger;
       },
@@ -223,7 +218,6 @@ const Environment: React.FC = () => {
   const queryDeviceManage = () => {
     //setLoading(true);
     queryEquipStatistics({
-      //floorId: 'Fl11010802593241ec348ecb4148806b9034c8957454',
       floorId: selFloorId,
       projectId: projectId,
     })
@@ -335,6 +329,7 @@ const Environment: React.FC = () => {
             selNavObj={selNav}
             navigatorList={navigatorList}
             mapList={mapCombineList}
+            queryDeviceManage={queryDeviceManage}
           ></TopNavRight>
         }
         changeFloorId={changeFloorId}

+ 7 - 7
src/services/ant-design-pro/environment.ts

@@ -2,7 +2,7 @@
 import { request } from 'umi';
 
 export async function getMapList(body: any, options?: { [key: string]: any }) {
-  return request<API.MapInfoRes>('/api/map/queryMapInfo', {
+  return request<API.MapInfoRes>('/api2/duoduo-service/setup-service/map/queryMapInfo', {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -13,7 +13,7 @@ export async function getMapList(body: any, options?: { [key: string]: any }) {
 }
 export async function getBuildingList(body: any, options?: { [key: string]: any }) {
   //debugger;
-  return request<API.BuildFloorList>('/api2/object/building/query', {
+  return request<API.BuildFloorList>('/api2/duoduo-service/object-service/object/building/query', {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -24,7 +24,7 @@ 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>('/api2/object/floor/query', {
+  return request<API.BuildFloorList>('/api2/duoduo-service/object-service/object/floor/query', {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -36,7 +36,7 @@ export async function getFloorList(body: any, options?: { [key: string]: any })
 export async function queryDeviceTimeManage(params: any, options?: { [key: string]: any }) {
   //  '/api3/duoduo-service/setup-service/deviceManage/queryDeviceTimeManage'
   return request<API.DeviceTimeType>(
-    '/api4/duoduo-service/setup-service/deviceManage/queryDeviceTimeManage',
+    '/api2/duoduo-service/setup-service/deviceManage/queryDeviceTimeManage',
     {
       method: 'GET',
       params: {
@@ -61,7 +61,7 @@ export async function queryPropertyData(params: any, options?: { [key: string]:
 export async function queryEnvironmentParam(body: any, otherParam: { [key: string]: any }) {
   //api2/duoduo-service/object-service/object/floor/queryParam
   return request<API.EnvironmentParam>(
-    `/api2/object/floor/queryParam?endTime=${otherParam.endTime}&startTime=${otherParam.startTime}&param=${otherParam.param}`,
+    `/api2/duoduo-service/object-service/object/floor/queryParam?endTime=${otherParam.endTime}&startTime=${otherParam.startTime}&param=${otherParam.param}`,
     {
       method: 'POST',
       headers: {
@@ -75,7 +75,7 @@ export async function queryEnvironmentParam(body: any, otherParam: { [key: strin
 export async function queryEquipStatistics(params: any, options?: { [key: string]: any }) {
   //
   return request<API.EnvironmentParam>(
-    `/duoduo-service/object-service/object/equipment/queryEquipStatistics`,
+    `/api/duoduo-service/object-service/object/equipment/queryEquipStatistics`,
     {
       method: 'GET',
       headers: {
@@ -91,7 +91,7 @@ export async function queryEquipStatistics(params: any, options?: { [key: string
 
 export async function querySpace(body: any, options?: { [key: string]: any }) {
   //
-  return request<API.EnvironmentParam>(`/api2/object/space/query`, {
+  return request<API.EnvironmentParam>(`/api2/duoduo-service/object-service/object/space/query`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',