diff --git a/springboot-web/src/main/java/com/tiesheng/web/config/operation/OperationAspect.java b/springboot-web/src/main/java/com/tiesheng/web/config/operation/OperationAspect.java index a7b995f..fdaec94 100644 --- a/springboot-web/src/main/java/com/tiesheng/web/config/operation/OperationAspect.java +++ b/springboot-web/src/main/java/com/tiesheng/web/config/operation/OperationAspect.java @@ -6,8 +6,9 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import com.tiesheng.annotation.operation.OperationIgnore; import com.tiesheng.annotation.operation.OperationLog; -import com.tiesheng.web.service.CoreLogService; import com.tiesheng.util.ServletKit; +import com.tiesheng.util.config.TsTokenConfig; +import com.tiesheng.web.service.CoreLogService; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -108,7 +109,7 @@ public class OperationAspect { } } - coreLogService.addOperationLog(title, subject, reqMaps); + coreLogService.addOperationLog(TsTokenConfig.getWithoutThr(), title, subject, reqMaps); return response; } diff --git a/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogOperationMapper.java b/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogOperationMapper.java index a3ca1f1..a8d0060 100644 --- a/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogOperationMapper.java +++ b/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogOperationMapper.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.tiesheng.web.pojos.dao.CoreLogOperation; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface CoreLogOperationMapper extends BaseMapper { @@ -20,4 +22,12 @@ public interface CoreLogOperationMapper extends BaseMapper { Page page(IPage page, @Param("ew") QueryWrapper queryWrapper); + /** + * 批量插入日志 + * + * @param coreLogOperations + * @return + */ + int batchInsert(@Param("list") List coreLogOperations); + } diff --git a/springboot-web/src/main/java/com/tiesheng/web/service/CoreLogService.java b/springboot-web/src/main/java/com/tiesheng/web/service/CoreLogService.java index 3ec9c7b..72b765a 100644 --- a/springboot-web/src/main/java/com/tiesheng/web/service/CoreLogService.java +++ b/springboot-web/src/main/java/com/tiesheng/web/service/CoreLogService.java @@ -2,11 +2,17 @@ package com.tiesheng.web.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.tiesheng.util.ServletKit; +import com.tiesheng.util.config.Ip2regionConfig; +import com.tiesheng.util.exception.ApiException; +import com.tiesheng.util.pojos.TokenBean; +import com.tiesheng.util.service.TsServiceBase; import com.tiesheng.web.mapper.CoreLogLoginMapper; import com.tiesheng.web.mapper.CoreLogMessageMapper; import com.tiesheng.web.mapper.CoreLogOperationMapper; @@ -19,12 +25,6 @@ import com.tiesheng.web.pojos.dao.CorePlatformUnique; import com.tiesheng.web.pojos.vo.ProcessDetailVo; import com.tiesheng.web.util.ProcessImportConsumer; import com.tiesheng.web.util.ProcessSyncConsumer; -import com.tiesheng.util.config.TsTokenConfig; -import com.tiesheng.util.pojos.TokenBean; -import com.tiesheng.util.ServletKit; -import com.tiesheng.util.config.Ip2regionConfig; -import com.tiesheng.util.exception.ApiException; -import com.tiesheng.util.service.TsServiceBase; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -38,6 +38,11 @@ import java.util.List; @Service public class CoreLogService extends TsServiceBase { + /** + * 日志缓存 + */ + private static final List cacheOperations = new ArrayList<>(); + @Autowired TieshengWebConfigurer tieshengWebConfigurer; @Autowired @@ -177,14 +182,19 @@ public class CoreLogService extends TsServiceBase= 100) { + getBaseMapper().batchInsert(cacheOperations); + cacheOperations.clear(); + } + } + } /////////////////////////////////////////////////////////////////////////// diff --git a/springboot-web/src/main/resources/mapper/CoreLogOperationMapper.xml b/springboot-web/src/main/resources/mapper/CoreLogOperationMapper.xml index 4ab642c..9c51164 100644 --- a/springboot-web/src/main/resources/mapper/CoreLogOperationMapper.xml +++ b/springboot-web/src/main/resources/mapper/CoreLogOperationMapper.xml @@ -24,4 +24,18 @@ ${ew.customSqlSegment} + + insert into core_log_operation(id, create_time, update_time, is_deleted, user_id, user_name, title, subject, + params) + values + + (uuid(), #{it.createTime}, #{it.updateTime}, 0, + #{it.userId}, + #{it.userName}, + #{it.title}, + #{it.subject}, + #{it.params}) + + +