Merge branch 'dev-ww' into 'main'

fix: 修复物模型数据布尔类型的属性未使用布尔单位

See merge request yunteng/thingskit-front!521

@@ -181,6 +181,7 @@ export interface DeviceRecord {
   profileId: string;
   profileId: string;
   alias?: string;
   alias?: string;
   brand?: string;
   brand?: string;
+  deviceProfileId: string;
   deviceProfile: {
   deviceProfile: {
     default: boolean;
     default: boolean;
     name: string;
     name: string;

 <script lang="ts" setup>
 <script lang="ts" setup>
-  import { nextTick, onUnmounted, reactive, ref, unref } from 'vue';
+  import { nextTick, onMounted, onUnmounted, reactive, ref, unref } from 'vue';
   import { List, Button, Card } from 'ant-design-vue';
   import { List, Button, Card } from 'ant-design-vue';
   import { PageWrapper } from '/@/components/Page';
   import { PageWrapper } from '/@/components/Page';
   import { BasicTable, useTable } from '/@/components/Table';
   import { BasicTable, useTable } from '/@/components/Table';
@@ -124,23 +124,54 @@
 
 
   const getUnit = (record: StructJSON) => {
   const getUnit = (record: StructJSON) => {
     const { dataType } = record;
     const { dataType } = record;
-    const { specs } = dataType! || {};
-    return isObject(specs)
+    const { specs, type } = dataType! || {};
+    const unitName = isObject(specs)
       ? (specs as Specs).unitName && (specs as Specs).unit
       ? (specs as Specs).unitName && (specs as Specs).unit
         ? `${(specs as Specs).unitName}`
         ? `${(specs as Specs).unitName}`
         : ''
         : ''
       : '';
       : '';
+    const { boolClose, boolOpen } = (specs || {}) as Specs;
+    return { unit: unitName, boolClose, boolOpen, type };
   };
   };
 
 
   const isStructAndTextType = (type: DataTypeEnum) => {
   const isStructAndTextType = (type: DataTypeEnum) => {
     return [DataTypeEnum.IS_STRUCT, DataTypeEnum.IS_STRING].includes(type);
     return [DataTypeEnum.IS_STRUCT, DataTypeEnum.IS_STRING].includes(type);
   };
   };
 
 
-  const { send, close, data } = useWebSocket(socketInfo.origin, {
+  const setDataSource = () => {
+    socketInfo.originData = socketInfo.dataSource = socketInfo.attrKeys.map((item) => {
+      const { identifier: key, name, detail } = item;
+      const { unit, boolClose, boolOpen, type } = getUnit(detail);
+      const dataInfo = socketInfo.attrKeys.find((item) => item.identifier === key);
+      let time: number | undefined;
+      let value: any | undefined;
+      const message = socketInfo.message[key];
+      if (message) {
+        const [attrTime, attrValue] = message.at(0) || [];
+        time = attrTime;
+        value = attrValue;
+      }
+
+      return {
+        key,
+        value,
+        time,
+        name,
+        unit,
+        type,
+        boolClose,
+        boolOpen,
+        showHistoryDataButton: !isStructAndTextType(
+          dataInfo?.detail.dataType?.type as unknown as DataTypeEnum
+        ),
+      };
+    });
+  };
+
+  const { send, close, data, open } = useWebSocket(socketInfo.origin, {
+    immediate: false,
+    autoReconnect: true,
     async onConnected() {
     async onConnected() {
-      const { deviceProfileId } = props.deviceDetail;
-      const value = await getDeviceAttrs({ deviceProfileId });
-      socketInfo.attrKeys = isArray(value) ? value : [];
       send(JSON.stringify(unref(getSendValue)));
       send(JSON.stringify(unref(getSendValue)));
     },
     },
     async onMessage() {
     async onMessage() {
@@ -153,23 +184,7 @@
             socketInfo.message[key] = value.data[key];
             socketInfo.message[key] = value.data[key];
           });
           });
 
 
-          socketInfo.originData = socketInfo.dataSource = socketInfo.attrKeys.map((item) => {
-            const { identifier: key, name, detail } = item;
-            const unit = getUnit(detail);
-            const [time, value] = socketInfo.message[key].at(0) || [];
-            const dataInfo = socketInfo.attrKeys.find((item) => item.identifier === key);
-
-            return {
-              key,
-              value,
-              time,
-              name,
-              unit,
-              showHistoryDataButton: !isStructAndTextType(
-                dataInfo?.detail.dataType?.type as unknown as DataTypeEnum
-              ),
-            };
-          });
+          setDataSource();
 
 
           await nextTick();
           await nextTick();
           setTableData(socketInfo.dataSource);
           setTableData(socketInfo.dataSource);
@@ -177,7 +192,7 @@
       } catch (error) {}
       } catch (error) {}
     },
     },
     onDisconnected() {
     onDisconnected() {
-      close();
+      // close();
     },
     },
     onError() {
     onError() {
       createMessage.error('webSocket连接超时,请联系管理员');
       createMessage.error('webSocket连接超时,请联系管理员');
@@ -190,6 +205,15 @@
     openModal(true);
     openModal(true);
   };
   };
 
 
+  onMounted(async () => {
+    const { deviceProfileId } = props.deviceDetail;
+    const value = await getDeviceAttrs({ deviceProfileId });
+    socketInfo.attrKeys = isArray(value) ? value : [];
+    console.log(socketInfo);
+    setDataSource();
+    open();
+  });
+
   onUnmounted(() => close());
   onUnmounted(() => close());
 </script>
 </script>
 
 
@@ -228,7 +252,13 @@
               </template>
               </template>
               <section class="min-h-16 flex flex-col justify-between">
               <section class="min-h-16 flex flex-col justify-between">
                 <div class="flex font-bold text-lg mb-4 gap-2">
                 <div class="flex font-bold text-lg mb-4 gap-2">
-                  <div>{{ item.value || '--' }}</div>
+                  <div>{{
+                    item.type === DataTypeEnum.IS_BOOL
+                      ? !!Number(item.value)
+                        ? item.boolOpen
+                        : item.boolClose
+                      : item.value || '--'
+                  }}</div>
                   <div class="text-xs flex items-center">{{ item.unit }}</div>
                   <div class="text-xs flex items-center">{{ item.unit }}</div>
                 </div>
                 </div>
                 <div class="text-dark-800 text-xs">
                 <div class="text-dark-800 text-xs">