From 0578ac871bf242e7855ece80e3eeffe907834bdf Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Thu, 19 Dec 2024 17:21:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B6=85=E7=BA=A7api=202024?=
 =?UTF-8?q?=E5=B9=B412=E6=9C=8819=E6=97=A517:21:03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IotThingApiServiceImpl.java  | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java
index eb0a47e..058606f 100644
--- a/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java
+++ b/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java
@@ -424,7 +424,18 @@ public class IotThingApiServiceImpl extends BaseServiceImpl<IotThingApiMapper, I
             return Maps.newHashMap();
         }
         //todo 这里主要是组态设计的websocket请求，可能需要修改
-        return encapsulationQuery(dto.getThingCondition(), dto.getAttrCondition(), dto.getTimeCondition(), dto.getReqParams(), null, null, dto.getSort(), null);
+        String remark = dto.getRemark();
+        Long tenantCode = dto.getTenantCode();
+        if (StringUtils.equals(remark, "0")) {
+            tenantCode = UserContext.getRealTenantCode();
+        }
+//        Map<String, Object> params = new HashMap<>();
+//        params.put("id", id);
+//        params.put("reqParams", dto.getReqParams());
+//        Map<String, Object> stringObjectMap1 = telemetryById(params);
+//        Map<String, Object> stringObjectMap = encapsulationQuery(dto.getThingCondition(), dto.getAttrCondition(), dto.getTimeCondition(), dto.getReqParams(), null, null, dto.getSort(), tenantCode);
+
+        return encapsulationQuery(dto.getThingCondition(), dto.getAttrCondition(), dto.getTimeCondition(), dto.getReqParams(), null, null, dto.getSort(), tenantCode);
     }
 
     @Override
@@ -489,19 +500,25 @@ public class IotThingApiServiceImpl extends BaseServiceImpl<IotThingApiMapper, I
         parmsMap.put("sort", sort);
         resultMap.put("param", parmsMap);
         resultMap.put("filterParam", reqParams);
+
+        //属性查询类型
+        Map<String, Object> entityResultMap = new HashMap<>();
+        Map<String, IotThingViewDTO> entityInfoMap = new HashMap<>();
+        ApiEntityAttrDTO attrsEntity = ApiEntityAttrDTO.createFromJson(attrCondition);
+        String type = attrsEntity.getType();
         //过滤条件的封装
         if (StringUtils.isNotBlank(reqParams)) {
             reqParams = packageQueryFilterParams(reqParams);
             Map<String, Object> conditionMap = BeanUtil.jsonConvertMap(reqParams);
-            // thingCondition = (String)conditionMap.get("entitys");
-            attrCondition = (String) conditionMap.get("attrs");
+            if (StringUtils.equalsAnyIgnoreCase(type, ApiSeparateAttr.SEPARATE.getValue())) {
+                attrCondition = conditionMap.get("splitAttrs").toString();
+            }else{
+                attrCondition = conditionMap.get("attrs").toString();
+            }
             //timeCondition = (String)conditionMap.get("times");TODO 暂时时间没有过滤
         }
-        //属性查询类型
-        Map<String, Object> entityResultMap = new HashMap<>();
-        Map<String, IotThingViewDTO> entityInfoMap = new HashMap<>();
-        ApiEntityAttrDTO attrsEntity = ApiEntityAttrDTO.createFromJson(attrCondition);
-        String type = attrsEntity.getType();
+
+
         //查询物和属性的参数
         Map<String, Collection<String>> paramMap = Maps.newHashMap();
         //分属性