Pre Merge pull request !153 from ChengKe/master-jdk17

pull/153/MERGE
ChengKe 2025-05-23 05:32:00 +00:00 committed by Gitee
commit 9e059c9e87
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 21 additions and 2 deletions

3
sql/mysql/update.sql Normal file
View File

@ -0,0 +1,3 @@
-- 添加新字段 is_success 在 action 字段之后
ALTER TABLE system_operate_log
ADD COLUMN success BIT NOT NULL DEFAULT b'1' COMMENT '操作结果' AFTER action;

View File

@ -31,6 +31,9 @@ public class OperateLogCreateReqDTO {
example = "修改编号为 1 的用户信息,将性别从男改成女,将姓名从芋道改成源码")
@NotEmpty(message = "操作内容不能为空")
private String action;
@Schema(description = "操作结果", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
@NotNull(message = "操作结果不能为空")
private Boolean success;
@Schema(description = "拓展字段", example = "{\"orderId\": \"1\"}")
private String extra;

View File

@ -63,6 +63,7 @@ public class LogRecordServiceImpl implements ILogRecordService {
reqDTO.setSubType(logRecord.getSubType());// 操作名称,例如:转移客户
reqDTO.setBizId(Long.parseLong(logRecord.getBizNo())); // 业务编号,例如:客户编号
reqDTO.setAction(logRecord.getAction());// 操作内容,例如:修改编号为 1 的用户信息,将性别从男改成女,将姓名从芋道改成源码。
reqDTO.setSuccess(!logRecord.isFail()); // 操作结果true 表示操作成功false 表示操作失败。
reqDTO.setExtra(logRecord.getExtra()); // 拓展字段,有些复杂的业务,需要记录一些字段 ( JSON 格式 ),例如说,记录订单编号,{ orderId: "1"}
}

View File

@ -28,6 +28,9 @@ public class OperateLogPageReqVO extends PageParam {
@Schema(description = "操作明细,模拟匹配", example = "修改编号为 1 的用户信息")
private String action;
@Schema(description = "操作结果", example = "false")
private Boolean success;
@Schema(description = "开始时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;

View File

@ -46,6 +46,9 @@ public class OperateLogRespVO implements VO {
@Schema(description = "操作明细", example = "修改编号为 1 的用户信息,将性别从男改成女,将姓名从芋道改成源码。")
private String action;
@Schema(description = "操作结果", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
private Boolean success;
@Schema(description = "拓展字段", example = "{'orderId': 1}")
private String extra;

View File

@ -58,6 +58,12 @@ public class OperateLogDO extends BaseDO {
* 1
*/
private String action;
/**
*
*
* truefalse
*/
private Boolean success;
/**
* ( JSON )
*

View File

@ -84,8 +84,8 @@ public class AdminUserServiceImpl implements AdminUserService {
@Override
@Transactional(rollbackFor = Exception.class)
@LogRecord(type = SYSTEM_USER_TYPE, subType = SYSTEM_USER_CREATE_SUB_TYPE, bizNo = "{{#user.id}}",
success = SYSTEM_USER_CREATE_SUCCESS)
@LogRecord(type = SYSTEM_USER_TYPE, subType = SYSTEM_USER_CREATE_SUB_TYPE, bizNo = "{{#user != null? user.id : 0}}",
success = SYSTEM_USER_CREATE_SUCCESS,fail = "创建用户失败,失败原因:【{{#_errorMsg}}】")
public Long createUser(UserSaveReqVO createReqVO) {
// 1.1 校验账户配合
tenantService.handleTenantInfo(tenant -> {