Merge branch 'fix/DEFECT-1890' into 'main_dev'

fix: DEFECT-1890 修复地图选择结构体时无法绘制路径

See merge request yunteng/thingskit-front!1188

@@ -12,6 +12,7 @@
   import { StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { HistoryData } from '/@/api/alarm/position/model';
   import { HistoryData } from '/@/api/alarm/position/model';
   import { useJsonParse } from '/@/hooks/business/useJsonParse';
   import { useJsonParse } from '/@/hooks/business/useJsonParse';
+  import { isObject, isString } from '/@/utils/is';
 
 
   const emit = defineEmits(['register', 'ok']);
   const emit = defineEmits(['register', 'ok']);
 
 
@@ -28,6 +29,14 @@
 
 
   const getPositionRecord = computed<DataSource>(() => unref(dataSourceRef).at(0) as DataSource);
   const getPositionRecord = computed<DataSource>(() => unref(dataSourceRef).at(0) as DataSource);
 
 
+  const getPositionIdentifier = computed(() => {
+    const { latitudeIdentifier, longitudeIdentifier } = unref(getPositionRecord);
+    return {
+      latitudeIdentifier,
+      longitudeIdentifier,
+    };
+  });
+
   const { getDeviceProfileTslByIdWithIdentifier } = useDeviceProfileQueryContext();
   const { getDeviceProfileTslByIdWithIdentifier } = useDeviceProfileQueryContext();
 
 
   const handleSetForm = async () => {
   const handleSetForm = async () => {
@@ -55,7 +64,7 @@
         );
         );
         return {
         return {
           label: `${detail.functionName} / ${structIdentifierDetail?.functionName}`,
           label: `${detail.functionName} / ${structIdentifierDetail?.functionName}`,
-          value: identifier,
+          value: `${identifier} / ${structIdentifierDetail?.identifier}`,
         };
         };
       }
       }
 
 
@@ -101,17 +110,15 @@
   });
   });
 
 
   const getPositionDataSource = async (res: HistoryData) => {
   const getPositionDataSource = async (res: HistoryData) => {
-    const keys = Object.keys(res);
     const track: Record<'lng' | 'lat', number>[] = [];
     const track: Record<'lng' | 'lat', number>[] = [];
-
     const {
     const {
       latitudeIdentifier = [],
       latitudeIdentifier = [],
       longitudeIdentifier = [],
       longitudeIdentifier = [],
       deviceProfileId,
       deviceProfileId,
     } = unref(getPositionRecord);
     } = unref(getPositionRecord);
 
 
-    const [latIdentifier] = latitudeIdentifier || [];
-    const [lngIdentifier] = longitudeIdentifier || [];
+    const [latIdentifier, structLatIdentifier] = latitudeIdentifier || [];
+    const [lngIdentifier, structLngIdentifier] = longitudeIdentifier || [];
 
 
     if (!latIdentifier || !lngIdentifier) return track;
     if (!latIdentifier || !lngIdentifier) return track;
 
 
@@ -133,27 +140,34 @@
       const { identifier } = detail || {};
       const { identifier } = detail || {};
 
 
       if (detail?.specs?.dataType.type === DataTypeEnum.STRUCT) {
       if (detail?.specs?.dataType.type === DataTypeEnum.STRUCT) {
-        const [, structIdentifier] = position;
         res[identifier].forEach((temp) => {
         res[identifier].forEach((temp) => {
-          const structJSON = useJsonParse(temp.value).value;
-          temp.value = structJSON?.[structIdentifier];
+          if (isString(temp.value)) {
+            temp.value = useJsonParse(temp.value).value;
+          }
         });
         });
       }
       }
     }
     }
 
 
     for (const ts of timespanList) {
     for (const ts of timespanList) {
-      const list: { ts: number; value: number }[] = [];
-      for (const key of keys) {
-        const record = res[key].find((item) => ts === item.ts);
-        list.push(record as any);
-      }
+      const latRecord = res[latIdentifier].find((item) => ts === item.ts);
+      const lngRecord = res[lngIdentifier].find((item) => ts === item.ts);
+
+      if (!latRecord || !lngRecord) continue;
+
+      const positionRecord = { lat: 0, lng: 0 };
+
+      positionRecord.lat =
+        structLatIdentifier && isObject(latRecord.value)
+          ? Reflect.get(latRecord.value as unknown as object, structLatIdentifier)
+          : latRecord.value;
+
+      positionRecord.lng =
+        structLngIdentifier && isObject(lngRecord.value)
+          ? Reflect.get(latRecord.value as unknown as object, structLngIdentifier)
+          : lngRecord.value;
 
 
-      if (list.length === 2 && list.every(Boolean)) {
-        let lng = list.at(0)?.value;
-        let lat = list.at(1)?.value;
-        if (lng && lat) {
-          track.push({ lng: Number(lng), lat: Number(lat) });
-        }
+      if (positionRecord.lat && positionRecord.lng) {
+        track.push({ lng: Number(positionRecord.lng), lat: Number(positionRecord.lat) });
       }
       }
     }
     }
 
 
@@ -171,7 +185,9 @@
 
 
       const res = await getDeviceHistoryInfo({
       const res = await getDeviceHistoryInfo({
         ...value,
         ...value,
-        [SchemaFiled.KEYS]: value[SchemaFiled.KEYS].join(','),
+        [SchemaFiled.KEYS]: `${unref(getPositionIdentifier).latitudeIdentifier?.at(0)},${unref(
+          getPositionIdentifier
+        ).longitudeIdentifier?.at(0)}`,
       });
       });
 
 
       const track = await getPositionDataSource(res);
       const track = await getPositionDataSource(res);

@@ -10,6 +10,7 @@
   import { useMultipleDataFetch } from '../../../hook/socket/useSocket';
   import { useMultipleDataFetch } from '../../../hook/socket/useSocket';
   import { MultipleDataFetchUpdateFn } from '../../../hook/socket/useSocket.type';
   import { MultipleDataFetchUpdateFn } from '../../../hook/socket/useSocket.type';
   import get from 'lodash-es/get';
   import get from 'lodash-es/get';
+  import { useJsonParse } from '/@/hooks/business/useJsonParse';
 
 
   const props = defineProps<{
   const props = defineProps<{
     config: ComponentPropsConfigType<typeof option>;
     config: ComponentPropsConfigType<typeof option>;
@@ -50,13 +51,25 @@
 
 
     const bindMessage = data[deviceId];
     const bindMessage = data[deviceId];
 
 
-    const lngData = get(bindMessage, unref(getLngKey)) || [];
+    const [lngIdentifier, structLngIdentifier] = unref(getLngKey);
+    const lngData = get(bindMessage, lngIdentifier) || [];
     const [lngLatest] = lngData;
     const [lngLatest] = lngData;
-    const [, lng] = lngLatest || [];
+    let [, lng] = lngLatest || [];
 
 
-    const latData = get(bindMessage, unref(getLatKey)) || [];
+    if (structLngIdentifier) {
+      const structValue = useJsonParse(lng).value;
+      lng = get(structValue, structLngIdentifier);
+    }
+
+    const [latIdentifier, structLatIdentifier] = unref(getLatKey);
+    const latData = get(bindMessage, latIdentifier) || [];
     const [latLatest] = latData;
     const [latLatest] = latData;
-    const [, lat] = latLatest || [];
+    let [, lat] = latLatest || [];
+
+    if (structLatIdentifier) {
+      const structValue = useJsonParse(lat).value;
+      lat = get(structValue, structLatIdentifier);
+    }
 
 
     if (validEffective(lng) && validEffective(lat)) {
     if (validEffective(lng) && validEffective(lat)) {
       drawLine({ lng: Number(lng), lat: Number(lat) });
       drawLine({ lng: Number(lng), lat: Number(lat) });

@@ -80,8 +80,14 @@ class Subscriber {
     this.componentGroupUpdateFnMap.clear();
     this.componentGroupUpdateFnMap.clear();
   }
   }
 
 
-  addSubscriber = (info: Record<'deviceId' | 'slaveDeviceId' | 'attribute' | 'uuid', string>) => {
-    const { deviceId, attribute, uuid } = info;
+  addSubscriber = (
+    info: Record<'deviceId' | 'slaveDeviceId' | 'attribute' | 'uuid' | 'frontId', string> & {
+      latitudeIdentifier?: string[];
+      longitudeIdentifier?: string[];
+    }
+  ) => {
+    const { deviceId, attribute, uuid, latitudeIdentifier = [], longitudeIdentifier = [] } = info;
+
     if (!this.deviceGroupMap.has(deviceId)) {
     if (!this.deviceGroupMap.has(deviceId)) {
       this.deviceGroupMap.set(deviceId, {
       this.deviceGroupMap.set(deviceId, {
         subscriptionId: this.getNextSubscribeId(),
         subscriptionId: this.getNextSubscribeId(),
@@ -92,6 +98,15 @@ class Subscriber {
 
 
     const groupInfo = this.deviceGroupMap.get(deviceId);
     const groupInfo = this.deviceGroupMap.get(deviceId);
     groupInfo?.attributes.add(attribute);
     groupInfo?.attributes.add(attribute);
+
+    if (latitudeIdentifier?.[0]) {
+      groupInfo?.attributes.add(latitudeIdentifier?.[0]);
+    }
+
+    if (longitudeIdentifier?.[0]) {
+      groupInfo?.attributes.add(longitudeIdentifier?.[0]);
+    }
+
     groupInfo?.subscriptionGroup.push({ uuid, attribute });
     groupInfo?.subscriptionGroup.push({ uuid, attribute });
 
 
     this.subscriptionMap.set(groupInfo!.subscriptionId, deviceId);
     this.subscriptionMap.set(groupInfo!.subscriptionId, deviceId);
@@ -296,8 +311,24 @@ export const useSocket = (dataSourceRef: Ref<WidgetDataType[]>) => {
     for (const item of unref(dataSourceRef)) {
     for (const item of unref(dataSourceRef)) {
       if (CUSTOM_SUBSCRIBE_MESSAGE_COMPONENT_KEY_LIST.includes(item.frontId)) continue;
       if (CUSTOM_SUBSCRIBE_MESSAGE_COMPONENT_KEY_LIST.includes(item.frontId)) continue;
       for (const temp of item.dataSource) {
       for (const temp of item.dataSource) {
-        const { deviceId, slaveDeviceId, attribute, uuid } = temp;
-        subscriber.addSubscriber({ deviceId, slaveDeviceId, attribute, uuid });
+        const {
+          deviceId,
+          slaveDeviceId,
+          attribute,
+          uuid,
+          longitudeIdentifier,
+          latitudeIdentifier,
+        } = temp;
+
+        subscriber.addSubscriber({
+          deviceId,
+          slaveDeviceId,
+          attribute,
+          uuid,
+          frontId: item.frontId,
+          longitudeIdentifier,
+          latitudeIdentifier,
+        });
       }
       }
     }
     }
   };
   };