- 后端：重构 system 模块

common/common-framework/src/main/java/cn/iocoder/common/framework/mybatis/QueryWrapperX.java

@@ -0,0 +1,22 @@
+package cn.iocoder.common.framework.mybatis;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.util.StringUtils;
+
+/**
+ * 拓展 MyBatis Plus QueryWrapper 类，主要增加如下功能：
+ *
+ * 1. 拼接条件的方法，增加 xxxIfPresent 方法，用于判断值不存在的时候，不要拼接到条件中。
+ *
+ * @param <T> 数据类型
+ */
+public class QueryWrapperX<T> extends QueryWrapper<T> {
+
+    public QueryWrapperX<T> likeIfPresent(String column, String val) {
+        if (StringUtils.hasText(val)) {
+            return (QueryWrapperX<T>) super.like(column, val);
+        }
+        return this;
+    }
+
+}

common/common-framework/src/main/java/cn/iocoder/common/framework/util/CollectionUtil.java

@@ -1,9 +1,8 @@
 package cn.iocoder.common.framework.util;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 public class CollectionUtil {
 
@@ -14,4 +13,21 @@ public class CollectionUtil {
     public static <T> Set<T> asSet(T... objs) {
         return new HashSet<>(Arrays.asList(objs));
     }
-}
+
+    public static <T, U> List<U> convertList(List<T> from, Function<T, U> func) {
+        return from.stream().map(func).collect(Collectors.toList());
+    }
+
+    public static <T, U> Set<U> convertSet(List<T> from, Function<T, U> func) {
+        return from.stream().map(func).collect(Collectors.toSet());
+    }
+
+    public static <T, K, V> Map<K, V> convertMap(List<T> from, Function<T, K> keyFunc, Function<T, V> valueFunc) {
+        return from.stream().collect(Collectors.toMap(keyFunc, valueFunc));
+    }
+
+    public static <T, K> Map<K, T> convertMap(List<T> from, Function<T, K> keyFunc) {
+        return from.stream().collect(Collectors.toMap(keyFunc, item -> item));
+    }
+
+}

common/common-framework/src/main/java/cn/iocoder/common/framework/vo/PageParam.java

@@ -0,0 +1,45 @@
+package cn.iocoder.common.framework.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+@ApiModel("分页参数")
+public class PageParam {
+
+    @ApiModelProperty(value = "页码，从 1 开始", required = true,example = "1")
+    @NotNull(message = "页码不能为空")
+    @Min(value = 1, message = "页码最小值为 1")
+    private Integer pageNo;
+
+    @ApiModelProperty(value = "每页条数，最大值为 100", required = true, example = "10")
+    @NotNull(message = "每页条数不能为空")
+    @Range(min = 1, max = 100, message = "条数范围为 [1, 100]")
+    private Integer pageSize;
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public PageParam setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+        return this;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public PageParam setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+        return this;
+    }
+
+    public final int getOffset() {
+        return (pageNo - 1) * pageSize;
+    }
+
+}

common/common-framework/src/main/java/cn/iocoder/common/framework/vo/PageResult.java

@@ -0,0 +1,36 @@
+package cn.iocoder.common.framework.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel("分页结果")
+public final class PageResult<T> implements Serializable {
+
+    @ApiModelProperty(value = "数据", required = true)
+    private List<T> list;
+
+    @ApiModelProperty(value = "总量", required = true)
+    private Integer total;
+
+    public List<T> getList() {
+        return list;
+    }
+
+    public PageResult<T> setList(List<T> list) {
+        this.list = list;
+        return this;
+    }
+
+    public Integer getTotal() {
+        return total;
+    }
+
+    public PageResult<T> setTotal(Integer total) {
+        this.total = total;
+        return this;
+    }
+
+}