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

优化：优化日志表结构（新增 module 所属模块字段）；优化日志引擎部分代码；使用 defaultIfNull() 和 blankToDefault 替换部分三元运算符代码（便于阅读及理解）；将 BaseEntity 重命名为 BaseDO

Browse Source
This commit is contained in:
Charles7c
2023-01-31 20:29:48 +08:00
parent 1837047a9e
commit 21fe29b56f
22 changed files with 144 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java
View File

@@ -93,7 +93,7 @@ public abstract class BaseController<S extends BaseService<V, D, Q, C>, V, D, Q,
* ID
* @return 详情信息
*/
@Operation(summary = "查看详情")
@Operation(summary = "查看数据详情")
@Parameter(name = "id", description = "ID", in = ParameterIn.PATH)
@ResponseBody
@GetMapping("/{id}")
@@ -109,7 +109,7 @@ public abstract class BaseController<S extends BaseService<V, D, Q, C>, V, D, Q,
* 创建信息
* @return 自增 ID
*/
@Operation(summary = "新增")
@Operation(summary = "新增数据")
@ResponseBody
@PostMapping
protected R<Long> create(@Validated(BaseRequest.Create.class) @RequestBody C request) {
@@ -124,7 +124,7 @@ public abstract class BaseController<S extends BaseService<V, D, Q, C>, V, D, Q,
* 修改信息
* @return /
*/
@Operation(summary = "修改")
@Operation(summary = "修改数据")
@ResponseBody
@PutMapping
protected R update(@Validated(BaseRequest.Update.class) @RequestBody C request) {
@@ -139,7 +139,7 @@ public abstract class BaseController<S extends BaseService<V, D, Q, C>, V, D, Q,
* ID 列表
* @return /
*/
@Operation(summary = "删除")
@Operation(summary = "删除数据")
@Parameter(name = "ids", description = "ID 列表", in = ParameterIn.PATH)
@ResponseBody
@DeleteMapping("/{ids}")

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseEntity.java → continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDO.java
View File

@@ -31,7 +31,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
* @since 2022/12/12 23:02
*/
@Data
public class BaseEntity implements Serializable {
public class BaseDO implements Serializable {
private static final long serialVersionUID = 1L;

30
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java
View File

@@ -24,7 +24,7 @@ import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import cn.hutool.core.util.ObjectUtil;
import top.charles7c.cnadmin.common.base.BaseEntity;
import top.charles7c.cnadmin.common.base.BaseDO;
import top.charles7c.cnadmin.common.exception.ServiceException;
import top.charles7c.cnadmin.common.util.helper.LoginHelper;
@@ -60,15 +60,15 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler {
Long createUser = LoginHelper.getUserId();
LocalDateTime createTime = LocalDateTime.now();
if (metaObject.getOriginalObject() instanceof BaseEntity) {
// 继承了 BaseEntity 的类，填充创建信息
BaseEntity baseEntity = (BaseEntity)metaObject.getOriginalObject();
baseEntity.setCreateUser(baseEntity.getCreateUser() != null ? baseEntity.getCreateUser() : createUser);
baseEntity.setCreateTime(baseEntity.getCreateTime() != null ? baseEntity.getCreateTime() : createTime);
baseEntity.setUpdateUser(baseEntity.getUpdateUser() != null ? baseEntity.getUpdateUser() : createUser);
baseEntity.setUpdateTime(baseEntity.getUpdateTime() != null ? baseEntity.getUpdateTime() : createTime);
if (metaObject.getOriginalObject() instanceof BaseDO) {
// 继承了 BaseDO 的类，填充创建信息
BaseDO baseDO = (BaseDO)metaObject.getOriginalObject();
baseDO.setCreateUser(ObjectUtil.defaultIfNull(baseDO.getCreateUser(), createUser));
baseDO.setCreateTime(ObjectUtil.defaultIfNull(baseDO.getCreateTime(), createTime));
baseDO.setUpdateUser(ObjectUtil.defaultIfNull(baseDO.getUpdateUser(), createUser));
baseDO.setUpdateTime(ObjectUtil.defaultIfNull(baseDO.getUpdateTime(), createTime));
} else {
// 未继承 BaseEntity 的类，根据类中拥有的创建信息进行填充，不存在创建信息不进行填充
// 未继承 BaseDO 的类，根据类中拥有的创建信息进行填充，不存在创建信息不进行填充
this.fillFieldValue(metaObject, CREATE_USER, createUser, false);
this.fillFieldValue(metaObject, CREATE_TIME, createTime, false);
this.fillFieldValue(metaObject, UPDATE_USER, createUser, false);
@@ -94,13 +94,13 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler {
Long updateUser = LoginHelper.getUserId();
LocalDateTime updateTime = LocalDateTime.now();
if (metaObject.getOriginalObject() instanceof BaseEntity) {
// 继承了 BaseEntity 的类，填充修改信息
BaseEntity baseEntity = (BaseEntity)metaObject.getOriginalObject();
baseEntity.setUpdateUser(updateUser);
baseEntity.setUpdateTime(updateTime);
if (metaObject.getOriginalObject() instanceof BaseDO) {
// 继承了 BaseDO 的类，填充修改信息
BaseDO baseDO = (BaseDO)metaObject.getOriginalObject();
baseDO.setUpdateUser(updateUser);
baseDO.setUpdateTime(updateTime);
} else {
// 未继承 BaseEntity 的类，根据类中拥有的修改信息进行填充，不存在修改信息不进行填充
// 未继承 BaseDO 的类，根据类中拥有的修改信息进行填充，不存在修改信息不进行填充
this.fillFieldValue(metaObject, UPDATE_USER, updateUser, true);
this.fillFieldValue(metaObject, UPDATE_TIME, updateTime, true);
}

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java
View File

@@ -159,7 +159,7 @@ public class QueryHelper {
// 如果没有单独指定属性名，就和使用该注解的属性的名称一致
// 注意：数据库规范中列采用下划线连接法命名，程序规范中变量采用驼峰法命名
String property = queryAnnotation.property();
fieldName = StrUtil.isNotBlank(property) ? property : fieldName;
fieldName = StrUtil.blankToDefault(property, fieldName);
String columnName = StrUtil.toUnderlineCase(fieldName);
switch (queryAnnotation.type()) {
case EQUAL: