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 |   88 ++++++++++++++++++++++---------------------
 1 files changed, 45 insertions(+), 43 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 d4ef144..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,67 +1,69 @@
 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;
 
 import java.util.Date;
 
 /**
- * @author woo
- * @date 2021/3/11
+ * MP娉ㄥ叆澶勭悊鍣�
+ *
+ * @author Lion Li
+ * @date 2021/4/25
  */
 public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
+
 	@Override
 	public void insertFill(MetaObject metaObject) {
-		//region 澶勭悊鍒涘缓浜轰俊鎭�
-		Object createBy = this.getFieldValByName("createBy", metaObject);
-		Object createTime = this.getFieldValByName("createTime", metaObject);
-		if (createBy == null) {
-			createBy = SecurityUtils.getUsername();
-			this.setFieldValByName("createBy", createBy, metaObject);
+		try {
+			//鏍规嵁灞炴�у悕瀛楄缃濉厖鐨勫��
+			if (metaObject.hasGetter("createTime")) {
+				if (Validator.isEmpty(metaObject.getValue("createTime"))) {
+					this.setFieldValByName("createTime", new Date(), 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);
 		}
-		if (createTime == null) {
-			createTime = new Date();
-			this.setFieldValByName("createTime", createTime, metaObject);
-		}
-		//endregion
-		//region 澶勭悊淇敼浜轰俊鎭�
-		Object updateBy = this.getFieldValByName("updateBy", metaObject);
-		Object updateTime = this.getFieldValByName("updateTime", metaObject);
-		if (updateBy == null) {
-			updateBy = createBy;
-			this.setFieldValByName("updateBy", updateBy, metaObject);
-		}
-		if (updateTime == null) {
-			updateTime = createTime;
-			this.setFieldValByName("updateTime", updateTime, metaObject);
-		}
-		//endregion
 	}
 
 	@Override
 	public void updateFill(MetaObject metaObject) {
-		//region 澶勭悊淇敼浜轰俊鎭�
-		Object updateBy = this.getFieldValByName("updateBy", metaObject);
-		Object updateTime = this.getFieldValByName("updateTime", metaObject);
-		if (updateBy == null) {
-			updateBy = SecurityUtils.getUsername();
-			this.setFieldValByName("updateBy", updateBy, metaObject);
+		try {
+			if (metaObject.hasGetter("updateBy")) {
+				if (Validator.isEmpty(metaObject.getValue("updateBy"))) {
+					this.setFieldValByName("updateBy", getLoginUsername(), 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);
 		}
-		if (updateTime == null) {
-			updateTime = new Date();
-			this.setFieldValByName("updateTime", updateTime, metaObject);
-		}
-		//endregion
 	}
 
-	@Override
-	public boolean openInsertFill() {
-		return true;
+	/**
+	 * 鑾峰彇鐧诲綍鐢ㄦ埛鍚�
+	 */
+	private String getLoginUsername() {
+		LoginUser loginUser = SecurityUtils.getLoginUser();
+		if (Validator.isEmpty(loginUser)) {
+			throw new CustomException("鐢ㄦ埛鏈櫥褰� => 鏃犳硶鑾峰彇鐢ㄦ埛淇℃伅");
+		}
+		return loginUser.getUsername();
 	}
 
-	@Override
-	public boolean openUpdateFill() {
-		return true;
-	}
 }

--
Gitblit v1.9.3