物实体过滤

2024年8月9日14:39:19

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));
         }