feat(rule): 添加规则名称模糊查询功能

iot-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IRuleInfoData.java

@@ -37,4 +37,8 @@ public interface IRuleInfoData extends IOwnedData<RuleInfo, String> {
 
     Paging<RuleInfo> findByType(String type, int page, int size);
 
+    Paging<RuleInfo> findByTypeAndNameLike(String type, String name, int page, int size);
+
+    Paging<RuleInfo> findByUidAndTypeAndNameLike(String uid, String type, String name, int page, int size);
+
 }

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/RuleInfoRepository.java

@@ -43,6 +43,10 @@ public interface RuleInfoRepository extends JpaRepository<TbRuleInfo, String>, Q
 
     Page<TbRuleInfo> findByType(String type, Pageable pageable);
 
+    Page<TbRuleInfo> findByTypeAndNameLike(String type, String name, Pageable pageable);
+
+    Page<TbRuleInfo> findByUidAndTypeAndNameLike(String uid, String type, String name, Pageable pageable);
+
     long countByUid(String uid);
 
 }

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/RuleInfoDataImpl.java

@@ -110,6 +110,31 @@ public class RuleInfoDataImpl implements IRuleInfoData, IJPACommData<RuleInfo, S
                 ruleInfoList);
     }
 
+    @Override
+    public Paging<RuleInfo> findByTypeAndNameLike(String type, String name, int page, int size) {
+        Page<TbRuleInfo> paged = ruleInfoRepository.findByTypeAndNameLike(type, "%" + name + "%",
+                Pageable.ofSize(size).withPage(page - 1));
+        List<RuleInfo> ruleInfoList = fromTb(paged.getContent());
+        for (RuleInfo tbRule :ruleInfoList) {
+            if (ObjectUtil.isNotNull(tbRule.getTenantId())) {
+                SysTenant sysTenant = new SysTenant();
+                sysTenant.setTenantId(tbRule.getTenantId());
+                SysTenant sysTenant1 = isSysTenantData.findOneByCondition(sysTenant);
+                if (sysTenant1 != null) {
+                    tbRule.setTenantName(sysTenant1.getCompanyName());
+                }
+            }
+        }
+        return new Paging<>(paged.getTotalElements(), ruleInfoList);
+    }
+
+    @Override
+    public Paging<RuleInfo> findByUidAndTypeAndNameLike(String uid, String type, String name, int page, int size) {
+        Page<TbRuleInfo> paged = ruleInfoRepository.findByUidAndTypeAndNameLike(uid, type, "%" + name + "%",
+                Pageable.ofSize(size).withPage(page - 1));
+        return new Paging<>(paged.getTotalElements(), fromTb(paged.getContent()));
+    }
+
     @Override
     public List<RuleInfo> findByUid(String uid) {
         return fromTb(ruleInfoRepository.findByUid(uid));

iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/RuleEngineServiceImpl.java

@@ -113,11 +113,18 @@ public class RuleEngineServiceImpl implements IRuleEngineService {
     public Paging<RuleInfoVo> selectPageList(PageRequest<RuleInfoBo> request) {
         RuleInfoBo data = request.getData();
         String type = data.getType();
+        String name = data.getName();
         Integer page = request.getPageNum();
         Integer size = request.getPageSize();
         if (AuthUtil.isAdmin()) {
+            if (StringUtils.isNotEmpty(name)) {
+                return MapstructUtils.convert(ruleInfoData.findByTypeAndNameLike(type, name, page, size), RuleInfoVo.class);
+            }
             return MapstructUtils.convert(ruleInfoData.findByType(type, page, size), RuleInfoVo.class);
         } else {
+            if (StringUtils.isNotEmpty(name)) {
+                return MapstructUtils.convert(ruleInfoData.findByUidAndTypeAndNameLike(AuthUtil.getUserId(), type, name, page, size), RuleInfoVo.class);
+            }
             return MapstructUtils.convert(ruleInfoData.findByUidAndType(AuthUtil.getUserId(), type, page, size), RuleInfoVo.class);
         }
     }