From c813046594b82230cd2cb61622d68a4981096e08 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 02 八月 2021 19:28:41 +0800
Subject: [PATCH] update 日常校验 统一重构到 StringUtils 便于维护扩展
---
ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 561ed41..20439da 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,11 +1,12 @@
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 com.ruoyi.common.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
import java.util.Date;
@@ -16,6 +17,7 @@
* @author Lion Li
* @date 2021/4/25
*/
+@Slf4j
public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
@Override
@@ -23,12 +25,12 @@
try {
//鏍规嵁灞炴�у悕瀛楄缃濉厖鐨勫��
if (metaObject.hasGetter("createTime")) {
- if (Validator.isEmpty(metaObject.getValue("createTime"))) {
+ if (StringUtils.isEmpty(metaObject.getValue("createTime"))) {
this.setFieldValByName("createTime", new Date(), metaObject);
}
}
if (metaObject.hasGetter("createBy")) {
- if (Validator.isEmpty(metaObject.getValue("createBy"))) {
+ if (StringUtils.isEmpty(metaObject.getValue("createBy"))) {
this.setFieldValByName("createBy", getLoginUsername(), metaObject);
}
}
@@ -41,12 +43,12 @@
public void updateFill(MetaObject metaObject) {
try {
if (metaObject.hasGetter("updateBy")) {
- if (Validator.isEmpty(metaObject.getValue("updateBy"))) {
+ if (StringUtils.isEmpty(metaObject.getValue("updateBy"))) {
this.setFieldValByName("updateBy", getLoginUsername(), metaObject);
}
}
if (metaObject.hasGetter("updateTime")) {
- if (Validator.isEmpty(metaObject.getValue("updateTime"))) {
+ if (StringUtils.isEmpty(metaObject.getValue("updateTime"))) {
this.setFieldValByName("updateTime", new Date(), metaObject);
}
}
@@ -59,9 +61,12 @@
* 鑾峰彇鐧诲綍鐢ㄦ埛鍚�
*/
private String getLoginUsername() {
- LoginUser loginUser = SecurityUtils.getLoginUser();
- if (Validator.isEmpty(loginUser)) {
- throw new CustomException("鐢ㄦ埛鏈櫥褰� => 鏃犳硶鑾峰彇鐢ㄦ埛淇℃伅");
+ LoginUser loginUser;
+ try {
+ loginUser = SecurityUtils.getLoginUser();
+ } catch (Exception e) {
+ log.warn("鑷姩娉ㄥ叆璀﹀憡 => 鐢ㄦ埛鏈櫥褰�");
+ return null;
}
return loginUser.getUsername();
}
--
Gitblit v1.9.3