فهرست منبع

有人无人接口更换

anxiaoxia 2 سال پیش
والد
کامیت
8795113ee0
3فایلهای تغییر یافته به همراه17 افزوده شده و 22 حذف شده
  1. 2 10
      src/models/sagacare_spaceFunc.ts
  2. 4 5
      src/pages/Equipment/index.tsx
  3. 11 7
      src/services/sagacare_service/environment.ts

+ 2 - 10
src/models/sagacare_spaceFunc.ts

@@ -63,16 +63,8 @@ export default function () {
   const [hasPersonList, setHasPersonList] = useState<any[]>([]);
 
   const querySpaceAdjustList = useCallback((selFloorId) => {
-    return getSpaceAdjustArray(
-      {
-        criteria: {
-          projectId: projectObj.projectId,
-          floorId: selFloorId,
-        },
-      },
-      {},
-    ).then(function (res) {
-      var resList = res.content || [];
+    return getSpaceAdjustArray({ floorId: selFloorId }, {}).then(function (res) {
+      var resList = res.data || [];
       setHasPersonList(resList);
       return 'next';
     });

+ 4 - 5
src/pages/Equipment/index.tsx

@@ -377,7 +377,7 @@ const Environment: React.FC = () => {
           setNavigatorList(navigatorList);
         }
       });
-      console.log(navigatorList, '-----navigatorList');
+      //   console.log(navigatorList, '-----navigatorList');
     });
   }
   function getSpaceHasPerson(sfId: any) {
@@ -451,14 +451,13 @@ const Environment: React.FC = () => {
         return ele.id == spaceId;
       });
       var filterSpace3 = hasPersonList.filter((ele) => {
-        return ele.id == spaceId;
+        return ele.spaceId == spaceId;
       });
       var combine = Object.assign({}, filterSpace3[0], filterSpace1[0], filterSpace2[0], mitem);
 
       combineList.push(combine);
     });
     setMapCombineList(combineList);
-    console.log('combine');
   }, [equipMapList, mapList, timeMapList, hasPersonList]);
 
   let firtTime: number = 0;
@@ -635,7 +634,7 @@ const Environment: React.FC = () => {
                       </div>
                     )}
                     {(selNav.id == 'airConditioner' || selNav.id == 'light') &&
-                      item.isPassengerPass &&
+                      item.runStatus === 1 &&
                       item.canClick && (
                         <div
                           className={mapstyles.hasPerson}
@@ -656,7 +655,7 @@ const Environment: React.FC = () => {
                         </div>
                       )}
                     {(selNav.id == 'airConditioner' || selNav.id == 'light') &&
-                      item.isPassengerPass == false &&
+                      item.runStatus === 0 &&
                       item.canClick && (
                         <div
                           className={mapstyles.hasPerson}

+ 11 - 7
src/services/sagacare_service/environment.ts

@@ -84,14 +84,18 @@ export async function queryPropertyData(params: any, options?: { [key: string]:
   );
 }
 // 有人无人
-export async function getSpaceAdjustArray(body: any, otherParam: any) {
-  return request<API.DeviceTimeType>(`/sgadmin/server/space/queryAll?${commonParams()}`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
+export async function getSpaceAdjustArray(params: any) {
+  return request<API.DeviceTimeType>(
+    `/sgadmin/duoduo-service/object-service/object/equipment/queryFloorSpaceStatus?projectId=${getProjectId()}&floorId=${
+      params.floorId
+    }&equipType=bodySensor&booleanInfoCode=isPassengerPass&expireTime=5`,
+    {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+      },
     },
-    data: body,
-  });
+  );
 }
 export async function queryEnvironmentParam(body: any, otherParam: { [key: string]: any }) {
   //api/duoduo-service/object-service/object/floor/queryParam