From 210b5af1c7f15f45c5d1abca607bd8d942a2b66a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 02 八月 2021 09:39:35 +0800
Subject: [PATCH] update 优化自动注入器 异常检查更完善
---
ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
index 4797a64..561ed41 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -1,6 +1,10 @@
package com.ruoyi.framework.mybatisplus;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.http.HttpStatus;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.SecurityUtils;
import org.apache.ibatis.reflection.MetaObject;
@@ -8,6 +12,7 @@
/**
* MP娉ㄥ叆澶勭悊鍣�
+ *
* @author Lion Li
* @date 2021/4/25
*/
@@ -15,31 +20,50 @@
@Override
public void insertFill(MetaObject metaObject) {
- //鏍规嵁灞炴�у悕瀛楄缃濉厖鐨勫��
- if (metaObject.hasGetter("createTime")) {
- if (metaObject.getValue("createTime") == null) {
- this.setFieldValByName("createTime", new Date(), metaObject);
+ try {
+ //鏍规嵁灞炴�у悕瀛楄缃濉厖鐨勫��
+ if (metaObject.hasGetter("createTime")) {
+ if (Validator.isEmpty(metaObject.getValue("createTime"))) {
+ this.setFieldValByName("createTime", new Date(), metaObject);
+ }
}
- }
- if (metaObject.hasGetter("createBy")) {
- if (metaObject.getValue("createBy") == null) {
- this.setFieldValByName("createBy", SecurityUtils.getUsername(), metaObject);
+ if (metaObject.hasGetter("createBy")) {
+ if (Validator.isEmpty(metaObject.getValue("createBy"))) {
+ this.setFieldValByName("createBy", getLoginUsername(), metaObject);
+ }
}
+ } catch (Exception e) {
+ throw new CustomException("鑷姩娉ㄥ叆寮傚父 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
}
}
@Override
public void updateFill(MetaObject metaObject) {
- if (metaObject.hasGetter("updateBy")) {
- if (metaObject.getValue("updateBy") == null) {
- this.setFieldValByName("updateBy", SecurityUtils.getUsername(), metaObject);
+ try {
+ if (metaObject.hasGetter("updateBy")) {
+ if (Validator.isEmpty(metaObject.getValue("updateBy"))) {
+ this.setFieldValByName("updateBy", getLoginUsername(), metaObject);
+ }
}
- }
- if (metaObject.hasGetter("updateTime")) {
- if (metaObject.getValue("updateTime") == null) {
- this.setFieldValByName("updateTime", new Date(), metaObject);
+ if (metaObject.hasGetter("updateTime")) {
+ if (Validator.isEmpty(metaObject.getValue("updateTime"))) {
+ this.setFieldValByName("updateTime", new Date(), metaObject);
+ }
}
+ } catch (Exception e) {
+ throw new CustomException("鑷姩娉ㄥ叆寮傚父 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
}
}
+ /**
+ * 鑾峰彇鐧诲綍鐢ㄦ埛鍚�
+ */
+ private String getLoginUsername() {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if (Validator.isEmpty(loginUser)) {
+ throw new CustomException("鐢ㄦ埛鏈櫥褰� => 鏃犳硶鑾峰彇鐢ㄦ埛淇℃伅");
+ }
+ return loginUser.getUsername();
+ }
+
}
--
Gitblit v1.9.3