修改车辆列表分页的功能

performance-web/src/main/java/com/clx/performance/service/impl/TruckServiceImpl.java

@@ -18,6 +18,7 @@ import com.msl.common.enums.ResultCodeEnum;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @ClassName TruckServiceImpl
@@ -252,25 +254,11 @@ public class TruckServiceImpl implements TruckService {
      * @Param [list, pagesize, currentPage]
      * @return
      **/
-    public static List<PageTruckListVO> pageBySubList(List<PageTruckListVO> list, int pagesize, int currentPage) {
-        int totalcount = list.size();
-        int pagecount = 0;
-        List<PageTruckListVO> subList;
-        int m = totalcount % pagesize;
-        if (m > 0) {
-            pagecount = totalcount / pagesize + 1;
-        } else {
-            pagecount = totalcount / pagesize;
+    public static List<PageTruckListVO> pageBySubList(List<PageTruckListVO> list, int pageSize, int currentPage) {
+        if(CollectionUtils.isEmpty(list)){
+            return list;
         }
-        if (m == 0) {
-            subList = list.subList((currentPage - 1) * pagesize, pagesize * (currentPage));
-        } else {
-            if (currentPage == pagecount) {
-                subList = list.subList((currentPage - 1) * pagesize, totalcount);
-            } else {
-                subList = list.subList((currentPage - 1) * pagesize, pagesize * (currentPage));
-            }
-        }
-        return subList;
+        return list.stream().skip((currentPage-1)*pageSize).limit(pageSize).collect(Collectors.toList());
     }
+
 }