Merge branch 'main_dev' into 'main'

fix: 修复双向命令下发时判断设备在线取值错误

See merge request yunteng/thingskit-scada!170

-import type { DeviceAttributeItemType, DeviceItemType, DeviceProfileItemType, OrganizationItemType, RpcCommandType, SendValue, ThingsModel, ThingsModelItemType } from './model'
+import type { DeviceActiveType, DeviceAttributeItemType, DeviceItemType, DeviceProfileItemType, OrganizationItemType, RpcCommandType, SendValue, ThingsModel, ThingsModelItemType } from './model'
 import { CommandWayEnum } from '@/enums/commandEnum'
 import { CommandWayEnum } from '@/enums/commandEnum'
 import type { DeviceTypeEnum } from '@/enums/datasource'
 import type { DeviceTypeEnum } from '@/enums/datasource'
 import { isShareMode } from '@/utils/env'
 import { isShareMode } from '@/utils/env'
@@ -113,7 +113,7 @@ export const genModbusCommand = (data: GenModbusCommandType) => {
 
 
 // 获取设备状态，在线 or 离线时间  entityId:设备id
 // 获取设备状态，在线 or 离线时间  entityId:设备id
 export const getDeviceActiveTime = (entityId: string) => {
 export const getDeviceActiveTime = (entityId: string) => {
-  return defHttp.get(
+  return defHttp.get<DeviceActiveType[]>(
     {
     {
       url: `/plugins/telemetry/DEVICE/${entityId}/values/attributes?keys=active`,
       url: `/plugins/telemetry/DEVICE/${entityId}/values/attributes?keys=active`,
     },
     },

@@ -183,3 +183,9 @@ export interface DeviceAttributeItemType {
   value: boolean
   value: boolean
   lastUpdateTs: number
   lastUpdateTs: number
 }
 }
+
+export interface DeviceActiveType {
+  key: string
+  lastUpdateTs: number
+  value: boolean
+}

@@ -192,7 +192,7 @@ const handleSubmit = async () => {
   }
   }
   if (serviceInfo.callType === 'SYNC') { // 服务命令调用方式 是同步 需要调用设备是否在线才能下发
   if (serviceInfo.callType === 'SYNC') { // 服务命令调用方式 是同步 需要调用设备是否在线才能下发
     const res = await getDeviceActiveTime(dataSourceJson.value.deviceId)
     const res = await getDeviceActiveTime(dataSourceJson.value.deviceId)
-    const { value } = res
+    const { value } = res?.[0] || {}
     if (!value) {
     if (!value) {
       createMessage.error('当前设备不在线')
       createMessage.error('当前设备不在线')
       return
       return