From 1ae369855ba448bc2562ebbbe59a89e42b8c53b0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 19 十月 2021 17:23:14 +0800
Subject: [PATCH] update 优化 多账号体系用户行为监听逻辑

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java |   47 ++++++++++++++++++++++++++++++++++-------------
 1 files changed, 34 insertions(+), 13 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..6d9d56a 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,45 +1,66 @@
 package com.ruoyi.framework.mybatisplus;
 
+import cn.hutool.http.HttpStatus;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
 
 import java.util.Date;
 
 /**
  * MP娉ㄥ叆澶勭悊鍣�
+ *
  * @author Lion Li
  * @date 2021/4/25
  */
+@Slf4j
 public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
 
 	@Override
 	public void insertFill(MetaObject metaObject) {
-		//鏍规嵁灞炴�у悕瀛楄缃濉厖鐨勫��
-		if (metaObject.hasGetter("createTime")) {
-			if (metaObject.getValue("createTime") == null) {
+		try {
+			//鏍规嵁灞炴�у悕瀛楄缃濉厖鐨勫��
+			if (metaObject.hasGetter("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")) {
+				this.setFieldValByName("createBy", getLoginUsername(), metaObject);
 			}
+		} catch (Exception e) {
+			throw new ServiceException("鑷姩娉ㄥ叆寮傚父 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
 		}
+		updateFill(metaObject);
 	}
 
 	@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")) {
+				this.setFieldValByName("updateBy", getLoginUsername(), metaObject);
 			}
-		}
-		if (metaObject.hasGetter("updateTime")) {
-			if (metaObject.getValue("updateTime") == null) {
+			if (metaObject.hasGetter("updateTime")) {
 				this.setFieldValByName("updateTime", new Date(), metaObject);
 			}
+		} catch (Exception e) {
+			throw new ServiceException("鑷姩娉ㄥ叆寮傚父 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
 		}
 	}
 
+	/**
+	 * 鑾峰彇鐧诲綍鐢ㄦ埛鍚�
+	 */
+	private String getLoginUsername() {
+		SysUser loginUser;
+		try {
+			loginUser = SecurityUtils.getUser();
+		} catch (Exception e) {
+			log.warn("鑷姩娉ㄥ叆璀﹀憡 => 鐢ㄦ埛鏈櫥褰�");
+			return null;
+		}
+		return loginUser.getUserName();
+	}
+
 }

--
Gitblit v1.9.3