ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-10 19:00:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 忽略获取在线用户信息异常

Browse Source
This commit is contained in:
Charles7c
2024-11-17 00:09:57 +08:00
parent 6abb444f9d
commit 48563663e1
2 changed files with 28 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java
View File

@@ -20,7 +20,6 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import org.apache.ibatis.reflection.MetaObject; import org.apache.ibatis.reflection.MetaObject;
import top.continew.admin.common.context.UserContextHolder; import top.continew.admin.common.context.UserContextHolder;
import top.continew.starter.core.exception.BusinessException;
import top.continew.starter.extension.crud.model.entity.BaseDO; import top.continew.starter.extension.crud.model.entity.BaseDO;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -57,23 +56,19 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler {
*/ */
@Override @Override
public void insertFill(MetaObject metaObject) { public void insertFill(MetaObject metaObject) {
try { if (null == metaObject) {
if (null == metaObject) { return;
return; }
} Long createUser = UserContextHolder.getUserId();
Long createUser = UserContextHolder.getUserId(); LocalDateTime createTime = LocalDateTime.now();
LocalDateTime createTime = LocalDateTime.now(); if (metaObject.getOriginalObject() instanceof BaseDO baseDO) {
if (metaObject.getOriginalObject() instanceof BaseDO baseDO) { // 继承了 BaseDO 的类，填充创建信息字段
// 继承了 BaseDO 的类，填充创建信息字段 baseDO.setCreateUser(ObjectUtil.defaultIfNull(baseDO.getCreateUser(), createUser));
baseDO.setCreateUser(ObjectUtil.defaultIfNull(baseDO.getCreateUser(), createUser)); baseDO.setCreateTime(ObjectUtil.defaultIfNull(baseDO.getCreateTime(), createTime));
baseDO.setCreateTime(ObjectUtil.defaultIfNull(baseDO.getCreateTime(), createTime)); } else {
} else { // 未继承 BaseDO 的类，如存在创建信息字段则进行填充
// 未继承 BaseDO 的类，如存在创建信息字段则进行填充 this.fillFieldValue(metaObject, CREATE_USER, createUser, false);
this.fillFieldValue(metaObject, CREATE_USER, createUser, false); this.fillFieldValue(metaObject, CREATE_TIME, createTime, false);
this.fillFieldValue(metaObject, CREATE_TIME, createTime, false);
}
} catch (Exception e) {
throw new BusinessException("插入数据时自动填充异常：" + e.getMessage());
} }
} }
@@ -84,23 +79,19 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler {
*/ */
@Override @Override
public void updateFill(MetaObject metaObject) { public void updateFill(MetaObject metaObject) {
try { if (null == metaObject) {
if (null == metaObject) { return;
return; }
} Long updateUser = UserContextHolder.getUserId();
Long updateUser = UserContextHolder.getUserId(); LocalDateTime updateTime = LocalDateTime.now();
LocalDateTime updateTime = LocalDateTime.now(); if (metaObject.getOriginalObject() instanceof BaseDO baseDO) {
if (metaObject.getOriginalObject() instanceof BaseDO baseDO) { // 继承了 BaseDO 的类，填充修改信息
// 继承了 BaseDO 的类，填充修改信息 baseDO.setUpdateUser(updateUser);
baseDO.setUpdateUser(updateUser); baseDO.setUpdateTime(updateTime);
baseDO.setUpdateTime(updateTime); } else {
} else { // 未继承 BaseDO 的类，根据类中拥有的修改信息字段进行填充，不存在修改信息字段不进行填充
// 未继承 BaseDO 的类，根据类中拥有的修改信息字段进行填充，不存在修改信息字段不进行填充 this.fillFieldValue(metaObject, UPDATE_USER, updateUser, true);
this.fillFieldValue(metaObject, UPDATE_USER, updateUser, true); this.fillFieldValue(metaObject, UPDATE_TIME, updateTime, true);
this.fillFieldValue(metaObject, UPDATE_TIME, updateTime, true);
}
} catch (Exception e) {
throw new BusinessException("修改数据时自动填充异常：" + e.getMessage());
} }
} }

6
continew-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java
View File

@@ -23,8 +23,6 @@ import cn.hutool.extra.spring.SpringUtil;
import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.util.ExceptionUtils;
import top.continew.starter.extension.crud.service.CommonUserService; import top.continew.starter.extension.crud.service.CommonUserService;
import java.util.Optional;
/** /**
* 用户上下文 Holder * 用户上下文 Holder
* *
@@ -142,7 +140,7 @@ public class UserContextHolder {
* @return 用户 ID * @return 用户 ID
*/ */
public static Long getUserId() { public static Long getUserId() {
return Optional.ofNullable(getContext()).map(UserContext::getId).orElse(null); return ExceptionUtils.exToNull(() -> getContext().getId());
} }
/** /**
@@ -151,7 +149,7 @@ public class UserContextHolder {
* @return 用户名 * @return 用户名
*/ */
public static String getUsername() { public static String getUsername() {
return Optional.ofNullable(getContext()).map(UserContext::getUsername).orElse(null); return ExceptionUtils.exToNull(() -> getContext().getUsername());
} }
/** /**