From d75b0e5fe57037fc431d47ec4625d53ed21ac51f Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Fri, 9 Aug 2024 14:39:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=AE=9E=E4=BD=93=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=202024=E5=B9=B48=E6=9C=889=E6=97=A514:39:19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IotThingEntityServiceImpl.java | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/thing/src/main/java/com/thing/thing/entity/service/impl/IotThingEntityServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/entity/service/impl/IotThingEntityServiceImpl.java
index eb6e788..0f8bd87 100644
--- a/modules/thing/src/main/java/com/thing/thing/entity/service/impl/IotThingEntityServiceImpl.java
+++ b/modules/thing/src/main/java/com/thing/thing/entity/service/impl/IotThingEntityServiceImpl.java
@@ -276,11 +276,12 @@ public class IotThingEntityServiceImpl extends BaseServiceImpl<IotThingEntityMap
             orderField = CacheNameEnum.EntityField.THING_ENTITY_CREATE_DATE.getField();
         }
         //封装参数
-        List<Pair<String, String>> pairs = buildParam(name,name,type,tenantCode,
+        List<Pair<String, String>> pairs = buildParam(type,tenantCode,
                 deptId,realType,tags,enableStatus,templateMark);
         String finalOrderField =  CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, orderField);
         Comparator<ObjectNode> comparator = CompareUtils.getComparator(order, finalOrderField);
         return thingList.stream().filter(jsonObject -> JacksonUtil.filter(jsonObject, pairs))
+                .filter(jsonObject -> JacksonUtil.filterOr(jsonObject, name,CacheNameEnum.EntityField.THING_ENTITY_CODE.getField(),CacheNameEnum.EntityField.THING_ENTITY_NAME.getField()))
                 .sorted(comparator.thenComparing(obj -> obj.get(CacheNameEnum.EntityField.THING_ENTITY_ID.getField()).asLong())).toList();
     }
 
@@ -924,9 +925,7 @@ public class IotThingEntityServiceImpl extends BaseServiceImpl<IotThingEntityMap
         return apiEntityList(apiEntityReqDTO);
     }
 
-    private List<Pair<String, String>> buildParam(String code,
-                                                  String name,
-                                                  String type,
+    private List<Pair<String, String>> buildParam(String type,
                                                   Long tenantCode,
                                                   Long deptId,
                                                   String realType,
@@ -935,12 +934,12 @@ public class IotThingEntityServiceImpl extends BaseServiceImpl<IotThingEntityMap
                                                   String templateMark)
     {
         List<Pair<String, String>> filterList = new ArrayList<>();
-        if (StringUtils.isNotBlank(code)) {
+      /*  if (StringUtils.isNotBlank(code)) {
             filterList.add(Pair.of(CacheNameEnum.EntityField.THING_ENTITY_CODE.getField(), code));
-        }
-        if (StringUtils.isNotBlank(name)) {
-            filterList.add(Pair.of(CacheNameEnum.EntityField.THING_ENTITY_NAME.getField(), name));
-        }
+        }*/
+//        if (StringUtils.isNotBlank(name)) {
+//            filterList.add(Pair.of(CacheNameEnum.EntityField.THING_ENTITY_NAME.getField(), name));
+//        }
         if (StringUtils.isNotBlank(type)) {
             filterList.add(Pair.of(CacheNameEnum.EntityField.THING_ENTITY_TYPE.getField(), type));
         }