From 13d6c42a4869cec4608f94cc46d2876797916a8f Mon Sep 17 00:00:00 2001 From: puhui999 Date: Tue, 12 Dec 2023 22:42:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=EF=BC=9A=E9=9B=86=E6=88=90=20mzt-biz-log=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customer/CrmCustomerServiceImpl.java | 2 +- .../YudaoOperateLogV2Configuration.java | 39 +------------------ .../AdminUserParseFunction.java | 10 +++-- .../bizlog/service/ILogRecordServiceImpl.java | 8 ++-- 4 files changed, 13 insertions(+), 46 deletions(-) rename yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/bizlog/{service => function}/AdminUserParseFunction.java (87%) diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java index 402cbcb31..141852584 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java @@ -135,7 +135,7 @@ public class CrmCustomerServiceImpl implements CrmCustomerService { public void transferCustomer(CrmCustomerTransferReqVO reqVO, Long userId) { // 1. 校验客户是否存在 validateCustomer(reqVO.getId()); - + // 添加 crmCustomer 到日志上下文 LogRecordContext.putVariable("crmCustomer", customerMapper.selectById(reqVO.getId())); // 2.1 数据权限转移 crmPermissionService.transferPermission( diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/bizlog/config/YudaoOperateLogV2Configuration.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/bizlog/config/YudaoOperateLogV2Configuration.java index 04fbdefea..a74dc343f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/bizlog/config/YudaoOperateLogV2Configuration.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/bizlog/config/YudaoOperateLogV2Configuration.java @@ -1,53 +1,16 @@ package cn.iocoder.yudao.module.system.framework.bizlog.config; -import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; -import cn.iocoder.yudao.module.system.api.logger.OperateLogApi; -import cn.iocoder.yudao.module.system.api.user.AdminUserApi; -import cn.iocoder.yudao.module.system.framework.bizlog.service.AdminUserParseFunction; -import cn.iocoder.yudao.module.system.framework.bizlog.service.ILogRecordServiceImpl; -import com.mzt.logapi.beans.Operator; -import com.mzt.logapi.service.IOperatorGetService; import com.mzt.logapi.starter.annotation.EnableLogRecord; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import java.util.Optional; - /** - * 使用 @Configuration 是因为 mzt-biz-log 的配置类是 @Configuration 的 + * * * @author HUIHUI */ @Configuration(proxyBeanMethods = false) @EnableLogRecord(tenant = "${yudao.info.base-package}") -@Slf4j public class YudaoOperateLogV2Configuration { - //======================= mzt-biz-log ======================= - - @Bean - public ILogRecordServiceImpl iLogRecordServiceImpl(OperateLogApi operateLogApi) { - log.info("ILogRecordServiceImpl 初始化"); - return new ILogRecordServiceImpl(operateLogApi); - } - - @Bean - public IOperatorGetService operatorGetLoginUserIdService() { - // 获取操作用户编号 - return () -> Optional.of(WebFrameworkUtils.getLoginUserId()) - .map(a -> { - Operator operator = new Operator(); - operator.setOperatorId(a.toString()); - return operator; - }) - .orElseThrow(() -> new IllegalArgumentException("user is null")); - } - - @Bean - public AdminUserParseFunction adminUserParseFunction(AdminUserApi adminUserApi) { - return new AdminUserParseFunction(adminUserApi); - } - } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/bizlog/service/AdminUserParseFunction.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/bizlog/function/AdminUserParseFunction.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/bizlog/service/AdminUserParseFunction.java rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/bizlog/function/AdminUserParseFunction.java index d29e3bac1..5e4d4f254 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/bizlog/service/AdminUserParseFunction.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/bizlog/function/AdminUserParseFunction.java @@ -1,12 +1,13 @@ -package cn.iocoder.yudao.module.system.framework.bizlog.service; +package cn.iocoder.yudao.module.system.framework.bizlog.function; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import com.mzt.logapi.service.IParseFunction; -import lombok.RequiredArgsConstructor; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; /** * 自定义函数-通过用户编号获取用户信息 @@ -14,10 +15,11 @@ import lombok.extern.slf4j.Slf4j; * @author HUIHUI */ @Slf4j -@RequiredArgsConstructor +@Component public class AdminUserParseFunction implements IParseFunction { - private final AdminUserApi adminUserApi; + @Resource + private AdminUserApi adminUserApi; @Override public boolean executeBefore() { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/bizlog/service/ILogRecordServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/bizlog/service/ILogRecordServiceImpl.java index 2e2c4b5bd..23584d247 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/bizlog/service/ILogRecordServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/bizlog/service/ILogRecordServiceImpl.java @@ -3,8 +3,9 @@ package cn.iocoder.yudao.module.system.framework.bizlog.service; import cn.iocoder.yudao.module.system.api.logger.OperateLogApi; import com.mzt.logapi.beans.LogRecord; import com.mzt.logapi.service.ILogRecordService; -import lombok.RequiredArgsConstructor; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; import java.util.Collections; import java.util.List; @@ -17,10 +18,11 @@ import java.util.List; * @author HUIHUI */ @Slf4j -@RequiredArgsConstructor +@Service public class ILogRecordServiceImpl implements ILogRecordService { - private final OperateLogApi operateLogApi; + @Resource + private OperateLogApi operateLogApi; @Override public void record(LogRecord logRecord) {