update：字典服务优化

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

@@ -1,14 +1,17 @@
 package cc.iotkit.data.service;
 
+import cc.iotkit.common.api.PageRequest;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.common.constant.UserConstants;
 import cc.iotkit.common.utils.MapstructUtils;
+import cc.iotkit.common.utils.StringUtils;
 import cc.iotkit.data.dao.IJPACommData;
 import cc.iotkit.data.dao.SysDictDataRepository;
 import cc.iotkit.data.model.TbSysDictData;
 import cc.iotkit.data.system.ISysDictData;
+import cc.iotkit.data.util.PageBuilder;
 import cc.iotkit.data.util.PredicateBuilder;
 import cc.iotkit.model.system.SysDictData;
-import cc.iotkit.model.system.SysDictType;
 import com.querydsl.core.types.Predicate;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
@@ -54,10 +57,16 @@ public class SysDictDataImpl implements ISysDictData, IJPACommData<SysDictData,
 
     @Override
     public List<SysDictData> findByConditions(SysDictData query) {
-        return findAllByCondition(query);
+        List<TbSysDictData> rets=jpaQueryFactory.select(tbSysDictData).from(tbSysDictData)
+                .where(buildQueryCondition(query)).orderBy(tbSysDictData.dictSort.asc())
+                .fetch();
+        return MapstructUtils.convert(rets,SysDictData.class);
     }
 
-
+    @Override
+    public Paging<SysDictData> findAll(PageRequest<SysDictData> pageRequest) {
+        return PageBuilder.toPaging(baseRepository.findAll(buildQueryCondition(pageRequest.getData()), PageBuilder.toPageable(pageRequest))).to(SysDictData.class);
+    }
 
     @Override
     public SysDictData findByDictTypeAndDictValue(String dictType, String dictValue) {
@@ -79,4 +88,12 @@ public class SysDictDataImpl implements ISysDictData, IJPACommData<SysDictData,
     public long countByDicType(String dictType) {
         return 0;
     }
+
+    private Predicate buildQueryCondition(SysDictData dictData) {
+        return PredicateBuilder.instance()
+                .and(dictData.getDictSort() != null, () -> tbSysDictData.dictSort.eq(dictData.getDictSort()))
+                .and(StringUtils.isNotEmpty(dictData.getDictLabel()), () -> tbSysDictData.dictLabel.like(dictData.getDictLabel()))
+                .and(StringUtils.isNotEmpty(dictData.getDictType()), () -> tbSysDictData.dictType.eq(dictData.getDictType()))
+                .and(StringUtils.isNotEmpty(dictData.getStatus()), () -> tbSysDictData.status.eq(dictData.getStatus())).build();
+    }
 }

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

@@ -2,22 +2,15 @@ package cc.iotkit.data.service;
 
 import cc.iotkit.common.api.PageRequest;
 import cc.iotkit.common.api.Paging;
-import cc.iotkit.common.constant.UserConstants;
-import cc.iotkit.common.utils.StreamUtils;
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.common.utils.StringUtils;
 import cc.iotkit.data.dao.IJPACommData;
-import cc.iotkit.data.dao.SysDeptRepository;
 import cc.iotkit.data.dao.SysDictTypeRepository;
 import cc.iotkit.data.model.TbSysDictType;
-import cc.iotkit.data.model.TbSysUser;
 import cc.iotkit.data.system.ISysDictTypeData;
 import cc.iotkit.data.util.PageBuilder;
 import cc.iotkit.data.util.PredicateBuilder;
-import cc.iotkit.model.system.SysDept;
 import cc.iotkit.model.system.SysDictType;
-import cc.iotkit.model.system.SysDictType;
-import cc.iotkit.model.system.SysUser;
-import cn.hutool.core.util.ObjectUtil;
 import com.querydsl.core.types.Predicate;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
@@ -30,7 +23,6 @@ import java.util.List;
 import java.util.Objects;
 
 import static cc.iotkit.data.model.QTbSysDictType.tbSysDictType;
-import static cc.iotkit.data.model.QTbSysUser.tbSysUser;
 
 /**
  * @Author：tfd
@@ -70,7 +62,10 @@ public class SysDictTypeDataImpl implements ISysDictTypeData, IJPACommData<SysDi
 
     @Override
     public List<SysDictType> findByConditions(SysDictType query) {
-        return null;
+        List<TbSysDictType> rets=jpaQueryFactory.select(tbSysDictType).from(tbSysDictType)
+                .where(buildQueryCondition(query))
+                .fetch();
+        return MapstructUtils.convert(rets, SysDictType.class);
     }
 
     @Override