diff --git a/src/main/java/com/darkness/api/mapper/demo/DemoMapper.java b/src/main/java/com/darkness/api/mapper/demo/DemoMapper.java deleted file mode 100644 index 7c12dee..0000000 --- a/src/main/java/com/darkness/api/mapper/demo/DemoMapper.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.darkness.api.mapper.demo; - -public class DemoMapper { -} diff --git a/src/main/java/com/darkness/api/mapper/test/TestMapper.java b/src/main/java/com/darkness/api/mapper/test/TestMapper.java deleted file mode 100644 index e82d295..0000000 --- a/src/main/java/com/darkness/api/mapper/test/TestMapper.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.darkness.api.mapper.test; - -public interface TestMapper { -} diff --git a/src/main/java/com/darkness/api/repository/demo/DemoRepository.java b/src/main/java/com/darkness/api/repository/demo/DemoRepository.java deleted file mode 100644 index 0e8d35a..0000000 --- a/src/main/java/com/darkness/api/repository/demo/DemoRepository.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.darkness.api.repository.demo; - -public interface DemoRepository { -} diff --git a/src/main/java/com/darkness/api/repository/test/TestRepository.java b/src/main/java/com/darkness/api/repository/test/TestRepository.java deleted file mode 100644 index 20427d1..0000000 --- a/src/main/java/com/darkness/api/repository/test/TestRepository.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.darkness.api.repository.test; - -public interface TestRepository { -} diff --git a/src/main/java/com/darkness/common/util/ConvertUtils.java b/src/main/java/com/darkness/common/util/ConvertUtils.java new file mode 100644 index 0000000..2063317 --- /dev/null +++ b/src/main/java/com/darkness/common/util/ConvertUtils.java @@ -0,0 +1,36 @@ +package com.darkness.common.util; + +import org.springframework.beans.BeanUtils; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +public class ConvertUtils { + + public static List convertList(List sourceList, Class clazz) { + if (CollectionUtils.isEmpty(sourceList)) { + return new ArrayList<>(); + } + List targetList = new ArrayList<>(sourceList.size()); + for (S sourceObj : sourceList) { + if (Objects.nonNull(sourceObj)) { + T targetObj = BeanUtils.instantiateClass(clazz); + BeanUtils.copyProperties(sourceObj, targetObj); + targetList.add(targetObj); + } else { + targetList.add(null); // 或者根据业务需求决定是否添加null + } + } + return targetList; + } + public static T convertObj(S sourceObj, Class clazz) { + if (Objects.isNull(sourceObj)) { + return null; + } + T targetObj = BeanUtils.instantiateClass(clazz); + BeanUtils.copyProperties(sourceObj, targetObj); + return targetObj; + } +} diff --git a/src/main/java/com/darkness/common/util/HandlePage.java b/src/main/java/com/darkness/common/util/HandlePage.java index 7cfdd88..6ffaaa2 100644 --- a/src/main/java/com/darkness/common/util/HandlePage.java +++ b/src/main/java/com/darkness/common/util/HandlePage.java @@ -5,13 +5,11 @@ import java.util.List; public class HandlePage { /**分页 start = (page - 1) * size, end = page * size*/ - private List handlePage(List source, int start, int end){ - int total = source.size(); -// end = end > total ? total : end; - end = Math.min(end, total); - if (end <= start) { - return null; - } - return source.subList(start,end); + public List handPage(List data,int pageNum,int pageSize){ + + int fromIndex = Math.min((pageNum - 1) * pageSize, data.size()); + int toIndex = Math.min(fromIndex + pageSize, data.size()); + + return data.subList(fromIndex, toIndex); } }