提交

base-starter/src/main/java/org/dromara/base/utils/AssertUtil.java

@@ -1,91 +0,0 @@
-package org.dromara.base.utils;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import org.dromara.common.core.exception.ServiceException;
-
-public class AssertUtil {
-
-    /**
-     * 断言不为空
-     */
-    public static void notEmpty(Object obj, String errStr, Object... params) {
-        if (ObjectUtil.isEmpty(obj)) {
-            throw new ServiceException(StrUtil.format(errStr, params));
-        }
-    }
-
-    /**
-     * 断言不为空
-     */
-    public static void notNull(Object obj, String errStr, Object... params) {
-        if (ObjectUtil.isNull(obj)) {
-            throw new ServiceException(StrUtil.format(errStr, params));
-        }
-    }
-
-    /**
-     * 断言不为空
-     */
-    public static void notBlank(String str, String errStr, Object... params) {
-        if (StrUtil.isBlank(str)) {
-            throw new ServiceException(StrUtil.format(errStr, params));
-        }
-    }
-
-    /**
-     * 断言为0
-     */
-    public static void eqZero(Integer integer, String errStr, Object... params) {
-        if (ObjectUtil.notEqual(integer, 0)) {
-            throw new ServiceException(StrUtil.format(errStr, params));
-        }
-    }
-
-    /**
-     * 断言为0
-     */
-    public static void eqZero(Long along, String errStr, Object... params) {
-        if (ObjectUtil.notEqual(along, 0L)) {
-            throw new ServiceException(StrUtil.format(errStr, params));
-        }
-    }
-
-    /**
-     * 断言为1
-     */
-    public static void eqOne(Integer integer, String errStr, Object... params) {
-        if (ObjectUtil.notEqual(integer, 1)) {
-            throw new ServiceException(StrUtil.format(errStr, params));
-        }
-    }
-
-    /**
-     * 断言为1
-     */
-    public static void eqOne(Long along, String errStr, Object... params) {
-        if (ObjectUtil.notEqual(along, 1L)) {
-            throw new ServiceException(StrUtil.format(errStr, params));
-        }
-    }
-
-    /**
-     * 断言为真
-     */
-    public static void eqTrue(Boolean flag, String errStr, Object... params) {
-        if (Boolean.TRUE.equals(flag)) {
-            throw new ServiceException(StrUtil.format(errStr, params));
-        }
-    }
-
-    /**
-     * 断言对象相等
-     */
-    public static void equals(Object obj1, Object obj2, String errStr, Object... params) {
-        if (ObjectUtil.notEqual(obj1, obj2)) {
-            throw new ServiceException(StrUtil.format(errStr, params));
-        }
-    }
-
-}

base-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1,2 @@
 org.dromara.base.config.ScanConfig
+org.dromara.base.config.ResponseAdvice

base-starter/src/main/java/org/dromara/base/domain/BaseAllPo.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseAllPo.java

@@ -1,4 +1,4 @@
-package org.dromara.base.domain;
+package org.dromara.common.mybatis.core.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

base-starter/src/main/java/org/dromara/base/domain/BaseCreatePo.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseCreatePo.java

@@ -1,4 +1,4 @@
-package org.dromara.base.domain;
+package org.dromara.common.mybatis.core.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

base-starter/src/main/java/org/dromara/base/domain/BaseIdPo.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseIdPo.java

@@ -1,4 +1,4 @@
-package org.dromara.base.domain;
+package org.dromara.common.mybatis.core.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

base-starter/src/main/java/org/dromara/base/domain/BaseSelectDto.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseSelectDto.java

@@ -1,4 +1,4 @@
-package org.dromara.base.domain;
+package org.dromara.common.mybatis.core.domain;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -66,7 +66,7 @@ public class BaseSelectDto implements Serializable {
      */
     public <T> Page<T> getPage() {
         if (ObjectUtil.equal(searchAll, true)) {
-            return new Page<>(getPageNum(), -1, false);
+            return new Page<>(1, Integer.MAX_VALUE, false);
         } else {
             return new Page<>(getPageNum(), getPageSize());
         }

base-starter/src/main/java/org/dromara/base/domain/BaseTimePo.java → ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseTimePo.java

@@ -1,4 +1,4 @@
-package org.dromara.base.domain;
+package org.dromara.common.mybatis.core.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java

@@ -7,7 +7,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
 import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.mybatis.core.domain.BaseAllPo;
+import org.dromara.common.mybatis.core.domain.BaseCreatePo;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.mybatis.core.domain.BaseTimePo;
 import org.dromara.common.satoken.utils.LoginHelper;
 
 import java.util.Date;
@@ -40,7 +43,29 @@ public class InjectionMetaObjectHandler implements MetaObjectHandler {
                     baseEntity.setCreateDept(ObjectUtil.isNotNull(baseEntity.getCreateDept())
                             ? baseEntity.getCreateDept() : loginUser.getDeptId());
                 }
+            } else if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseAllPo po) {
+                Date current = new Date();
+                po.setCreateTime(current);
+                po.setUpdateTime(current);
+
+                LoginUser loginUser = getLoginUser();
+                if (ObjectUtil.isNotNull(loginUser)) {
+                    Long userId = loginUser.getUserId();
+                    po.setCreateBy(userId);
+                    po.setUpdateBy(userId);
+                }
+            } else if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseCreatePo po) {
+                Date current = new Date();
+                po.setCreateTime(current);
+
+                LoginUser loginUser = getLoginUser();
+                if (ObjectUtil.isNotNull(loginUser)) {
+                    po.setCreateBy(loginUser.getUserId());
+                }
+            } else if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseTimePo po) {
+                po.setCreateTime(new Date());
             }
+
         } catch (Exception e) {
             throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
         }
@@ -58,6 +83,17 @@ public class InjectionMetaObjectHandler implements MetaObjectHandler {
                 if (ObjectUtil.isNotNull(loginUser)) {
                     baseEntity.setUpdateBy(loginUser.getUserId());
                 }
+            } else if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseAllPo baseEntity) {
+                Date current = new Date();
+                baseEntity.setUpdateTime(current);
+
+                LoginUser loginUser = getLoginUser();
+                if (ObjectUtil.isNotNull(loginUser)) {
+                    Long userId = loginUser.getUserId();
+                    baseEntity.setUpdateBy(userId);
+                }
+            } else if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseTimePo po) {
+                po.setUpdateTime(new Date());
             }
         } catch (Exception e) {
             throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);