1. system 提供新的 Resource 相关接口

2. admin-web 接入新的 Resource 相关接口
2020-04-27 22:40:12 +08:00
parent f7157d283c
commit a279495936
44 changed files with 277 additions and 202 deletions
--- a/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/dataobject/BaseDO.java
+++ b/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/dataobject/BaseDO.java
@@ -0,0 +1,45 @@
+package cn.iocoder.mall.mybatis.dataobject;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 基础实体对象
+ */
+public class BaseDO implements Serializable {
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 最后更新时间
+     */
+    private Date updateTime;
+
+    @Override
+    public String toString() {
+        return "BaseDO{" +
+                "createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public BaseDO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public BaseDO setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+}
--- a/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/dataobject/DeletableDO.java
+++ b/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/dataobject/DeletableDO.java
@@ -0,0 +1,34 @@
+package cn.iocoder.mall.mybatis.dataobject;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+
+/**
+ * extends BaseDO 扩展 delete 操作
+ *
+ * @author Sin
+ * @time 2019-03-22 22:03
+ */
+public class DeletableDO extends BaseDO {
+
+    /**
+     * 是否删除
+     */
+    @TableLogic
+    private Integer deleted;
+
+    @Override
+    public String toString() {
+        return "DeletableDO{" +
+                "deleted=" + deleted +
+                '}';
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public DeletableDO setDeleted(Integer deleted) {
+        this.deleted = deleted;
+        return this;
+    }
+}
--- a/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/enums/DeletedStatusEnum.java
+++ b/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/enums/DeletedStatusEnum.java
@@ -0,0 +1,37 @@
+package cn.iocoder.mall.mybatis.enums;
+
+import cn.iocoder.mall.mybatis.dataobject.DeletableDO;
+
+/**
+ * {@link DeletableDO#getDeleted()} delete 状态
+ *
+ * @author Sin
+ * @time 2019-03-22 21:15
+ */
+public enum DeletedStatusEnum {
+
+    DELETED_NO(0, "正常(未删除)"),
+    DELETED_YES(1, "删除");
+
+    /**
+     * 状态值
+     */
+    private Integer value;
+    /**
+     * 状态名
+     */
+    private String name;
+
+    DeletedStatusEnum(Integer value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
--- a/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/query/QueryWrapperX.java
+++ b/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/query/QueryWrapperX.java
@@ -0,0 +1,47 @@
+package cn.iocoder.mall.mybatis.query;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.util.Collection;
+
+/**
+ * 拓展 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;
+    }
+
+    public QueryWrapperX<T> inIfPresent(String column, Collection<?> values) {
+        if (!CollectionUtils.isEmpty(values)) {
+            return (QueryWrapperX<T>) super.in(column, values);
+        }
+        return this;
+    }
+
+    public QueryWrapperX<T> inIfPresent(String column, Object... values) {
+        if (!ArrayUtils.isEmpty(values)) {
+            return (QueryWrapperX<T>) super.in(column, values);
+        }
+        return this;
+    }
+
+    public QueryWrapperX<T> eqIfPresent(String column, Object val) {
+        if (val != null) {
+            return (QueryWrapperX<T>) super.eq(column, val);
+        }
+        return this;
+    }
+
+}
--- a/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/type/JSONTypeHandler.java
+++ b/common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/type/JSONTypeHandler.java
@@ -0,0 +1,70 @@
+package cn.iocoder.mall.mybatis.type;
+
+import com.alibaba.fastjson.JSON;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * TODO 芋艿
+ *
+ * 参考 https://www.cnblogs.com/waterystone/p/5547254.html
+ *
+ * 后续，补充下注释和测试类，以及文章。
+ *
+ * @param <T>
+ */
+public class JSONTypeHandler<T extends Object> extends BaseTypeHandler<T> {
+
+    private Class<T> clazz;
+
+    public JSONTypeHandler(Class<T> clazz) {
+        if (clazz == null) throw new IllegalArgumentException("Type argument cannot be null");
+        this.clazz = clazz;
+    }
+
+    @Override
+    public void setNonNullParameter(PreparedStatement ps, int i, T parameter, JdbcType jdbcType) throws SQLException {
+        ps.setString(i, this.toJson(parameter));
+    }
+
+    @Override
+    public T getNullableResult(ResultSet rs, String columnName) throws SQLException {
+        return this.toObject(rs.getString(columnName), clazz);
+    }
+
+    @Override
+    public T getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+        return this.toObject(rs.getString(columnIndex), clazz);
+    }
+
+    @Override
+    public T getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+        return this.toObject(cs.getString(columnIndex), clazz);
+    }
+
+    private String toJson(T object) {
+        try {
+            return JSON.toJSONString(object);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private T toObject(String content, Class<?> clazz) {
+        if (content != null && !content.isEmpty()) {
+            try {
+                return (T) JSON.parseObject(content, clazz);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            return null;
+        }
+    }
+
+}