浏览代码

针对大方合并做的修改 修改文件名字

zhaojijng 2 年之前
父节点
当前提交
025e55d7e3
共有 37 个文件被更改,包括 223 次插入67 次删除
  1. 20 12
      config/proxy.ts
  2. 2 2
      src/app.tsx
  3. 1 1
      src/config/api.js
  4. 0 0
      src/config/sagacare_image.js
  5. 0 0
      src/config/sagacare_user.ts
  6. 1 1
      src/layouts/index.jsx
  7. 0 0
      src/models/sagacare_buildFloor.ts
  8. 0 0
      src/models/sagacare_searchInfo.ts
  9. 0 0
      src/models/sagacare_spaceFunc.ts
  10. 1 1
      src/pages/Environment/components/chartModal/index.jsx
  11. 1 1
      src/pages/Environment/components/chartModal/lineChart.jsx
  12. 9 9
      src/pages/Environment/index.tsx
  13. 1 1
      src/pages/Equipment/checLampStatus.js
  14. 2 2
      src/pages/Equipment/components/deviceModal/airEq/index.jsx
  15. 2 2
      src/pages/Equipment/components/deviceModal/curtainEq/curtainBtn.jsx
  16. 2 2
      src/pages/Equipment/components/deviceModal/curtainEq/index.jsx
  17. 2 2
      src/pages/Equipment/components/deviceModal/index.jsx
  18. 2 2
      src/pages/Equipment/components/deviceModal/lampEq/index.jsx
  19. 1 1
      src/pages/Equipment/components/topNavRight/index.tsx
  20. 1 1
      src/pages/Equipment/equipmentControl.js
  21. 9 9
      src/pages/Equipment/index.tsx
  22. 1 1
      src/pages/Runtime/RecordList/index.jsx
  23. 8 8
      src/pages/Runtime/index.tsx
  24. 0 0
      src/sagacare_components/PageHeader/index.less
  25. 0 0
      src/sagacare_components/PageHeader/index.tsx
  26. 0 0
      src/sagacare_components/SearchInput/index.less
  27. 3 2
      src/sgcomponents/SearchInput/index.tsx
  28. 0 0
      src/sagacare_components/map/index.less
  29. 1 1
      src/sgcomponents/map/index.tsx
  30. 0 0
      src/sagacare_components/navMenu/index.less
  31. 0 0
      src/sagacare_components/navMenu/index.tsx
  32. 0 0
      src/sagacare_components/topNavigator/index.less
  33. 5 4
      src/sgcomponents/topNavigator/index.tsx
  34. 1 1
      src/services/sgservice/environment.ts
  35. 146 0
      src/services/sagacare_service/equipment copy.js
  36. 1 1
      src/services/sgservice/equipment.js
  37. 0 0
      src/services/sagacare_service/typings.d.ts

+ 20 - 12
config/proxy.ts

@@ -9,20 +9,28 @@
 export default {
   dev: {
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
-    '/sgadmin/duoduo-service': {
-      //target: 'https://duoduoenv.sagacloud.cn/',
-      target: 'http://10.100.28.79',
+    // '/sgadmin/duoduo-service': {
+    //   //target: 'https://duoduoenv.sagacloud.cn/',
+    //   target: 'http://10.100.28.79',
+    //   changeOrigin: true,
+    //   pathRewrite: {
+    //     '^/sgadmin/duoduo-service': '/sgadmin/duoduo-service',
+    //   },
+    // },
+    // '/sgadmin/sso': {
+    //   //target: 'https://duoduoenv.sagacloud.cn/',
+    //   target: 'http://10.100.28.79',
+    //   changeOrigin: true,
+    //   pathRewrite: {
+    //     '^/sgadmin/sso': '/sgadmin/sso',
+    //   },
+    // },
+    '/sgadmin': {
+      target: 'https://duoduoenv.sagacloud.cn/',
+      //target: 'http://10.100.28.79',
       changeOrigin: true,
       pathRewrite: {
-        '^/sgadmin/duoduo-service': '/sgadmin/duoduo-service',
-      },
-    },
-    '/sgadmin/sso': {
-      //target: 'https://duoduoenv.sagacloud.cn/',
-      target: 'http://10.100.28.79',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/sgadmin/sso': '/sgadmin/sso',
+        '^/sgadmin': '',
       },
     },
   },

+ 2 - 2
src/app.tsx

@@ -1,8 +1,8 @@
 import { PageLoading } from '@ant-design/pro-layout';
 import { history, useModel } from 'umi';
-import { checkToken, reFreshCheckToken } from '@/services/sgservice/environment';
+import { checkToken, reFreshCheckToken } from '@/services/sagacare_service/environment';
 import { projectObj } from '@/config/api.js';
-import UserStorage from '@/config/user';
+import UserStorage from '@/config/sagacare_user';
 const loginPath = '/noAuth';
 
 /** 获取用户信息比较慢的时候会展示一个 loading */

+ 1 - 1
src/config/api.js

@@ -1,4 +1,4 @@
 export const BASE_PATH = '/api';
 //export const projectId = 'Pj3301100002';//之江
 //export const projectId = 'Pj1101080259';//Pj1101080259
-export const projectObj = { projectId: 'Pj3301100002' };
+export const projectObj = { projectId: 'Pj1101080259' };

src/config/image.js → src/config/sagacare_image.js


src/config/user.ts → src/config/sagacare_user.ts


+ 1 - 1
src/layouts/index.jsx

@@ -5,7 +5,7 @@ import { MenuFoldOutlined, SmileOutlined } from '@ant-design/icons';
 import Icon from '@/tenants-ui/SgIcon';
 
 import { Drawer, notification } from 'antd';
-import NavMenu from '@/sgcomponents/navMenu';
+import NavMenu from '@/sagacare_components/navMenu';
 
 export default (props) => {
   const { menuVisible, closeMenu, toggleMenu } = useModel('controller');

src/models/buildFloor.ts → src/models/sagacare_buildFloor.ts


src/models/searchInfo.ts → src/models/sagacare_searchInfo.ts


src/models/spaceFunc.ts → src/models/sagacare_spaceFunc.ts


+ 1 - 1
src/pages/Environment/components/chartModal/index.jsx

@@ -3,7 +3,7 @@ import { Modal, Form } from 'antd';
 import Icon from '@/tenants-ui/SgIcon';
 import styles from './index.less';
 import cx from 'classnames';
-import { equipImageMap } from '@/config/image.js';
+import { equipImageMap } from '@/config/sagacare_image.js';
 import LineChart from './lineChart';
 
 export default ({ onClose, showSpace, selNav }) => {

+ 1 - 1
src/pages/Environment/components/chartModal/lineChart.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect, useRef } from 'react';
 import { Line } from '@ant-design/plots';
 import { Spin } from 'antd';
 import styles from './index.less';
-import { queryPropertyData } from '@/services/sgservice/environment';
+import { queryPropertyData } from '@/services/sagacare_service/environment';
 export default ({ paramObj, spaceId }) => {
   let [data, setData] = useState([]);
   let [levelMax, setLevelMax] = useState(0);

+ 9 - 9
src/pages/Environment/index.tsx

@@ -1,14 +1,14 @@
 import React, { useState, useEffect } from 'react';
 import { FormattedMessage, useModel, useRequest } from 'umi';
-import PageHeader from '@/sgcomponents/PageHeader';
-import Map from '@/sgcomponents/map';
-import SearchInput from '@/sgcomponents/SearchInput';
-import TopNavigator from '@/sgcomponents/topNavigator';
+import PageHeader from '@/sagacare_components/PageHeader';
+import Map from '@/sagacare_components/map';
+import SearchInput from '@/sagacare_components/SearchInput';
+import TopNavigator from '@/sagacare_components/topNavigator';
 import ChartModal from './components/chartModal';
 import moment from 'moment';
-import { getMapList, queryEnvironmentParam } from '@/services/sgservice/environment';
+import { getMapList, queryEnvironmentParam } from '@/services/sagacare_service/environment';
 import { projectObj } from '@/config/api.js';
-import { equipImageMap } from '@/config/image.js';
+import { equipImageMap } from '@/config/sagacare_image.js';
 import { Spin } from 'antd';
 import Icon from '@/tenants-ui/SgIcon';
 
@@ -29,8 +29,8 @@ export type navigatorItem = {
   [key: string]: any;
 };
 const Environment: React.FC = () => {
-  const { changeLastFloorId } = useModel('buildFloor');
-  const { searchSpace } = useModel('searchInfo');
+  const { changeLastFloorId } = useModel('sagacare_buildFloor');
+  const { searchSpace } = useModel('sagacare_searchInfo');
   const { envir_temperature, envir_wet, envir_co2, envir_pm25, envir_jiaquan } = equipImageMap;
 
   const [showChart, setShowChart] = useState(false);
@@ -102,7 +102,7 @@ const Environment: React.FC = () => {
 
   const [envirMapList, setEnvirMapList] = useState<API.MapInfo[]>([]);
   const [mapCombineList, setMapCombineList] = useState<any[]>([]);
-  const { getSpaceFunc } = useModel('spaceFunc');
+  const { getSpaceFunc } = useModel('sagacare_spaceFunc');
 
   const changeFloorId = (data: string) => {
     setSelFloorId(data);

+ 1 - 1
src/pages/Equipment/checLampStatus.js

@@ -1,4 +1,4 @@
-import { setallLampHttp, getStatusHttp } from '@/services/sgservice/equipment';
+import { setallLampHttp, getStatusHttp } from '@/services/sagacare_service/equipment';
 // import { message } from 'antd';
 
 // 定时调用 查询指令接口

+ 2 - 2
src/pages/Equipment/components/deviceModal/airEq/index.jsx

@@ -2,9 +2,9 @@ import React, { useState, useEffect, useRef } from 'react';
 import { message } from 'antd';
 import styles from './index.less';
 import commonStyles from '../common.less';
-import { equipImageMap } from '@/config/image.js';
+import { equipImageMap } from '@/config/sagacare_image.js';
 import AnSwitch from '../anSwitch';
-import { getFeedbackDocumentsHttp, changeAirHttp } from '@/services/sgservice/equipment';
+import { getFeedbackDocumentsHttp, changeAirHttp } from '@/services/sagacare_service/equipment';
 
 export default ({ spaceId, projectId }) => {
   const {

+ 2 - 2
src/pages/Equipment/components/deviceModal/curtainEq/curtainBtn.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useCallback, useRef } from 'react';
 import commonStyles from '../common.less';
-import { equipImageMap } from '@/config/image.js';
-import { setEquipeHttp } from '@/services/sgservice/equipment';
+import { equipImageMap } from '@/config/sagacare_image.js';
+import { setEquipeHttp } from '@/services/sagacare_service/equipment';
 
 const { curtain_close_icon_row, curtain_open_icon_row } = equipImageMap;
 

+ 2 - 2
src/pages/Equipment/components/deviceModal/curtainEq/index.jsx

@@ -1,9 +1,9 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import styles from './index.less';
 import commonStyles from '../common.less';
-import { equipImageMap } from '@/config/image.js';
+import { equipImageMap } from '@/config/sagacare_image.js';
 import CurtainBtn from './curtainBtn';
-import { getObjectDataEqpGroupHttp } from '@/services/sgservice/equipment';
+import { getObjectDataEqpGroupHttp } from '@/services/sagacare_service/equipment';
 
 const { curtain_open_row, expend_down, expend_up } = equipImageMap;
 

+ 2 - 2
src/pages/Equipment/components/deviceModal/index.jsx

@@ -2,11 +2,11 @@ import React, { useState, useEffect, useMemo } from 'react';
 import { Modal, Row, Col } from 'antd';
 import Icon from '@/tenants-ui/SgIcon';
 import styles from './index.less';
-import { equipImageMap } from '@/config/image.js';
+import { equipImageMap } from '@/config/sagacare_image.js';
 import AirEq from './airEq';
 import LampEq from './lampEq';
 import CurtainEq from './curtainEq';
-import { getSpaceAdjustList } from '@/services/sgservice/equipment';
+import { getSpaceAdjustList } from '@/services/sagacare_service/equipment';
 import { useRef } from 'react';
 import { useModel } from 'umi';
 import { projectObj } from '@/config/api.js';

+ 2 - 2
src/pages/Equipment/components/deviceModal/lampEq/index.jsx

@@ -2,9 +2,9 @@ import React, { useState, useEffect, useCallback, useRef } from 'react';
 import { message } from 'antd';
 import styles from './index.less';
 import commonStyles from '../common.less';
-import { equipImageMap } from '@/config/image.js';
+import { equipImageMap } from '@/config/sagacare_image.js';
 import AnSwitch from '../anSwitch';
-import { getLampHttp, getStatusHttp, setallLampHttp } from '@/services/sgservice/equipment';
+import { getLampHttp, getStatusHttp, setallLampHttp } from '@/services/sagacare_service/equipment';
 import { setallLamps } from '@/pages/Equipment/checLampStatus.js';
 const { lamp_open, lamp_close, expend_down, expend_up } = equipImageMap;
 export default ({ spaceId }) => {

+ 1 - 1
src/pages/Equipment/components/topNavRight/index.tsx

@@ -4,7 +4,7 @@ import { Dropdown, Menu, Modal, message } from 'antd';
 import Icon from '@/tenants-ui/SgIcon';
 import { EllipsisOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
 import styles from './index.less';
-//import { equipImageMap } from '@/config/image.js';
+//import { equipImageMap } from '@/config/sagacare_image.js';
 import type { navigatorItem } from '@/pages/Environment/index';
 import { projectObj } from '@/config/api.js';
 

+ 1 - 1
src/pages/Equipment/equipmentControl.js

@@ -8,7 +8,7 @@ import {
     getStatusHttp,
     getLampHttp,
     getFeedbackDocumentsHttp
-} from '@/services/sgservice/equipment';
+} from '@/services/sagacare_service/equipment';
 
 import { Spin, Modal, message } from 'antd';
 import { setallLamps } from '@/pages/Equipment/checLampStatus.js';

+ 9 - 9
src/pages/Equipment/index.tsx

@@ -1,10 +1,10 @@
 import React, { useState, useEffect, useRef, useCallback } from 'react';
 import { FormattedMessage, useModel } from 'umi';
 
-import SearchInput from '@/sgcomponents/SearchInput';
-import PageHeader from '@/sgcomponents/PageHeader';
-import Map from '@/sgcomponents/map';
-import TopNavigator from '@/sgcomponents/topNavigator';
+import SearchInput from '@/sagacare_components/SearchInput';
+import PageHeader from '@/sagacare_components/PageHeader';
+import Map from '@/sagacare_components/map';
+import TopNavigator from '@/sagacare_components/topNavigator';
 import TopNavRight from './components/topNavRight';
 import DeviceModal from './components/deviceModal';
 
@@ -15,7 +15,7 @@ import { Spin, Modal, message } from 'antd';
 import moment from 'moment';
 
 import { ExclamationCircleOutlined } from '@ant-design/icons';
-import { equipImageMap } from '@/config/image.js';
+import { equipImageMap } from '@/config/sagacare_image.js';
 import Icon from '@/tenants-ui/SgIcon';
 import type { navigatorItem } from '@/pages/Environment/index';
 import { projectObj } from '@/config/api.js';
@@ -23,7 +23,7 @@ import {
   getMapList,
   queryEquipStatistics,
   queryDeviceTimeManage,
-} from '@/services/sgservice/environment';
+} from '@/services/sagacare_service/environment';
 
 import {
   changeCurtain,
@@ -44,9 +44,9 @@ type statistics = {
   runCount: number;
 };
 const Environment: React.FC = () => {
-  const { changeLastFloorId } = useModel('buildFloor');
-  const { searchSpace } = useModel('searchInfo');
-  const { getSpaceFunc } = useModel('spaceFunc');
+  const { changeLastFloorId } = useModel('sagacare_buildFloor');
+  const { searchSpace } = useModel('sagacare_searchInfo');
+  const { getSpaceFunc } = useModel('sagacare_spaceFunc');
   const { envir_all, equip_air, equip_lamp, envir_curtain } = equipImageMap;
 
   const [showModal, setShowModal] = useState<boolean>(false);

+ 1 - 1
src/pages/Runtime/RecordList/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useCallback } from 'react';
-import PageHeader from '@/sgcomponents/PageHeader';
+import PageHeader from '@/sagacare_components/PageHeader';
 import { useDebounceEffect } from 'ahooks';
 import { FormattedMessage } from 'umi';
 import styles from './index.less';

+ 8 - 8
src/pages/Runtime/index.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useCallback, useRef } from 'react';
-import PageHeader from '@/sgcomponents/PageHeader';
-import Map from '@/sgcomponents/map';
-import TopNavigator from '@/sgcomponents/topNavigator';
+import PageHeader from '@/sagacare_components/PageHeader';
+import Map from '@/sagacare_components/map';
+import TopNavigator from '@/sagacare_components/topNavigator';
 import RunNavRight from './components/topNavRight';
 import { FormattedMessage, history, useModel } from 'umi';
 import { Spin } from 'antd';
@@ -9,11 +9,11 @@ import { Popover } from 'antd';
 import styles from './index.less';
 import mapstyles from '@/assets/css/map.less';
 import Icon from '@/tenants-ui/SgIcon';
-import SearchInput from '@/sgcomponents/SearchInput';
+import SearchInput from '@/sagacare_components/SearchInput';
 import moment from 'moment';
 import cx from 'classnames';
 
-import { getMapList, queryDeviceTimeManage } from '@/services/sgservice/environment';
+import { getMapList, queryDeviceTimeManage } from '@/services/sagacare_service/environment';
 
 type runtimeNavType = {
   normalRun: any;
@@ -23,9 +23,9 @@ type runtimeNavType = {
 
 const Runtime: React.FC = () => {
   // const { maptemp6 } = equipImageMap;
-  const { changeLastFloorId } = useModel('buildFloor');
-  const { searchSpace } = useModel('searchInfo');
-  const { getSpaceFunc } = useModel('spaceFunc');
+  const { changeLastFloorId } = useModel('sagacare_buildFloor');
+  const { searchSpace } = useModel('sagacare_searchInfo');
+  const { getSpaceFunc } = useModel('sagacare_spaceFunc');
   const [loading, setLoading] = useState<boolean>(false);
   const [runtimeNav, setRuntimeNav] = useState<runtimeNavType>({});
   const [mapList, setMapList] = useState<API.MapInfo[]>([]);

src/sgcomponents/PageHeader/index.less → src/sagacare_components/PageHeader/index.less


src/sgcomponents/PageHeader/index.tsx → src/sagacare_components/PageHeader/index.tsx


src/sgcomponents/SearchInput/index.less → src/sagacare_components/SearchInput/index.less


+ 3 - 2
src/sgcomponents/SearchInput/index.tsx

@@ -9,7 +9,7 @@ type mapResType = {
   localName: string;
   [key: string]: any;
 };
-import { querySpace } from '@/services/sgservice/environment';
+import { querySpace } from '@/services/sagacare_service/environment';
 import { projectObj } from '@/config/api.js';
 const { Option } = Select;
 
@@ -20,7 +20,8 @@ type SearchInputProps = {
 const SearchInput: React.FC<SearchInputProps> = () => {
   const [matchData, setMatchData] = useState<mapResType[]>([]);
   const [value, setValue] = useState<any>();
-  const { changeSearchBuildId, changeSearchFloorId, changeSearchText } = useModel('searchInfo');
+  const { changeSearchBuildId, changeSearchFloorId, changeSearchText } =
+    useModel('sagacare_searchInfo');
   const [loading, setLoading] = useState<boolean>(false);
   const ref = useRef<any>(0);
   const searchQuery = (value: string) => {

src/sgcomponents/map/index.less → src/sagacare_components/map/index.less


+ 1 - 1
src/sgcomponents/map/index.tsx

@@ -26,7 +26,7 @@ const Map: React.FC<MapProps> = ({ type, selFloorId, render, mapList, mapSize })
     changeSearchText,
     changeSearchFloorId,
     changeSearchBuildId,
-  } = useModel('searchInfo');
+  } = useModel('sagacare_searchInfo');
 
   const [startPageX, setStartPageX] = useState<number>(0);
   const [startPageY, setStartPageY] = useState<number>(0);

src/sgcomponents/navMenu/index.less → src/sagacare_components/navMenu/index.less


src/sgcomponents/navMenu/index.tsx → src/sagacare_components/navMenu/index.tsx


src/sgcomponents/topNavigator/index.less → src/sagacare_components/topNavigator/index.less


+ 5 - 4
src/sgcomponents/topNavigator/index.tsx

@@ -4,10 +4,10 @@ import cx from 'classnames';
 import { Select } from 'antd';
 
 import type { navigatorItem } from '@/pages/Environment/index';
-import { getBuildingList, getFloorList } from '@/services/sgservice/environment';
+import { getBuildingList, getFloorList } from '@/services/sagacare_service/environment';
 import { projectObj } from '@/config/api.js';
 import { useModel } from 'umi';
-import UserStorage from '@/config/user';
+import UserStorage from '@/config/sagacare_user';
 
 export type topNavigatorProps = {
   navigatorList?: navigatorItem[];
@@ -37,8 +37,9 @@ const TopNavigator: React.FC<topNavigatorProps> = ({
   selParamObj,
 }) => {
   //存储的 搜索到空间的buildingId floorId
-  const { searchBuildId, searchFloorId } = useModel('searchInfo');
-  const { lastBuildId, lastFloorId, changeLastBuildId, changeLastFloorId } = useModel('buildFloor');
+  const { searchBuildId, searchFloorId } = useModel('sagacare_searchInfo');
+  const { lastBuildId, lastFloorId, changeLastBuildId, changeLastFloorId } =
+    useModel('sagacare_buildFloor');
   const [buildList, setBuildList] = useState<buildItem[]>([]);
   const [currentBuild, setCurrentBuild] = useState<string>();
   const [floorList, setFloorList] = useState<floorItem[]>([]);

+ 1 - 1
src/services/sgservice/environment.ts

@@ -1,7 +1,7 @@
 /** 登录接口 POST /api/login/account */
 import { request } from 'umi';
 import { projectObj } from '@/config/api';
-import UserStorage from '@/config/user';
+import UserStorage from '@/config/sagacare_user';
 
 export async function getMapList(body: any, options?: { [key: string]: any }) {
   return request<API.MapInfoRes>(

+ 146 - 0
src/services/sagacare_service/equipment copy.js

@@ -0,0 +1,146 @@
+import { request } from 'umi';
+import { projectId } from '@/config/api.js';
+import UserStorage from '@/config/sagacare_user';
+
+// function getProjectId() {
+//     //const id = window.localStorage.getItem('localProjectId')
+//     const id = projectId
+//     return id;
+// }
+
+function commonParams({ userId, userName, projectId }) {
+    // var userObj = UserStorage.getInstance();
+    //  const user = userObj.getUser();
+    var pubname = '';
+    if (getProjectId() == 'Pj3301100002') {
+        pubname = 'sgadmin'
+    } else {
+        pubname = 'sagacareAndtenantslink'
+    }
+    return `openid=${userId}&pubname=${pubname}&projectId=${projectId}&userId=${userId}&userName=${userName}`;
+}
+
+// function commonParams() {
+//     return `openid=9a1ecfbacb6b4f249bf2dd3ec7793ead&pubname=sagacareAndtenantslink&projectId=${getProjectId()}&userName=%E5%AE%89%E5%B0%8F%E9%9C%9E&userPhone=17611228068&userId=9a1ecfbacb6b4f249bf2dd3ec7793ead`;
+// }
+
+
+//窗帘  设置设备
+//窗帘  设置设备
+export const setEquipeHttp = (params, userProject) => {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/object/eqp/infocode/set?${commonParams(userProject)}`, {
+        method: 'POST',
+        isNotShowErrorToast: true,
+        errorSave: true,
+        data: JSON.stringify(params),
+        headers: {
+            'Content-Type': 'application/json',
+        },
+    });
+}
+
+//窗帘 获取设备
+export const getObjectDataEqpGroupHttp = (params, userProject) => {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/object/objectDataEqpGroup/query?${commonParams(userProject)}`, {
+        method: 'POST',
+        isNotShowErrorToast: true,
+        errorSave: true,
+        data: JSON.stringify(params),
+        headers: {
+            'Content-Type': 'application/json',
+        }
+    });
+}
+
+
+
+// 灯的状态
+export const getLampHttp = (params, userProject) => {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/light/status/query?${commonParams(userProject)}&spaceId=${params}`, {
+        timeout: 1000,
+        skipErrorHandler: true,
+        method: 'GET',
+        headers: {
+            'Content-Type': 'application/json',
+        },
+    });
+};
+
+
+// 批量 开关灯
+export const setallLampHttp = (params, userProject) => {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/light/onoff/set?${commonParams(userProject)}`, {
+        method: 'POST',
+        isNotShowErrorToast: true,
+        errorSave: true,
+        data: JSON.stringify(params),
+        headers: {
+            'Content-Type': 'application/json',
+        },
+    });
+};
+
+// 开关失败时 定时查询灯状态 
+export const getStatusHttp = (params, userProject) => {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/light/onoff/setSatus?${commonParams(userProject)}`, {
+        method: 'POST',
+        isNotShowErrorToast: true,
+        errorSave: true,
+        data: JSON.stringify(params),
+        headers: {
+            'Content-Type': 'application/json',
+        },
+    });
+};
+
+
+//  空调 - 调节文案/空调信息
+export const getFeedbackDocumentsHttp = (params, userProject) => {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/custom/feedback/documents?${commonParams(userProject)}`, {
+        isNotShowErrorToast: true,
+        errorSave: true,
+        method: 'POST',
+        data: JSON.stringify(params),
+        headers: {
+            'Content-Type': 'application/json',
+        },
+    });
+};
+
+//  空调 调节
+export const changeAirHttp = (params, userProject) => {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/custom/feedbackCreate/v2?${commonParams(userProject)}`, {
+        method: 'POST',
+        isNotShowErrorToast: true,
+        errorSave: true,
+        data: JSON.stringify({ ...params, projectId: getProjectId() }),
+        headers: {
+            'Content-Type': 'application/json',
+        },
+    });
+};
+
+// 空间环境质量
+export const getSpaceAdjustList = (params, userProject) => {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/space/property?${commonParams(userProject)}`, {
+        method: 'POST',
+        isNotShowErrorToast: true,
+        errorSave: true,
+        data: params,
+        headers: {
+            'Content-Type': 'application/json',
+        },
+    });
+}
+//  批量空调 调节
+export const changeAllAirHttp = (body, userProject) => {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/custom/feedbackCreate/v2Batch?${commonParams(userProject)}`, {
+        method: 'POST',
+        isNotShowErrorToast: true,
+        errorSave: true,
+        data: body,
+        headers: {
+            'Content-Type': 'application/json',
+        },
+    });
+};

+ 1 - 1
src/services/sgservice/equipment.js

@@ -1,6 +1,6 @@
 import { request } from 'umi';
 import { projectObj } from '@/config/api.js';
-import UserStorage from '@/config/user';
+import UserStorage from '@/config/sagacare_user';
 
 function getProjectId() {
     //const id = window.localStorage.getItem('localProjectId')

src/services/sgservice/typings.d.ts → src/services/sagacare_service/typings.d.ts