admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

日志修改

Browse Source
This commit is contained in:
GUO 2024-06-01 14:37:49 +08:00
parent d8ce26b057
commit b9debfecd0
12 changed files with 188 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/config/DataSourceOneConfig.java
View File

@ -3,12 +3,10 @@ package com.zhgd.config;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.DataPermissionInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import com.zhgd.mybatis.DataScopeHandler;
import com.zhgd.mybatis.DataScopeInterceptor;
import org.apache.ibatis.logging.stdout.StdOutImpl;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan;
@ -43,7 +41,7 @@ public class DataSourceOneConfig {
//开启驼峰
MybatisConfiguration configuration = new MybatisConfiguration();
configuration.setMapUnderscoreToCamelCase(true);
configuration.setLogImpl(StdOutImpl.class);
configuration.setLogImpl(StdOutImplCustom.class);
bean.setConfiguration(configuration);
bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:com/zhgd/xmgl/**/*.xml"));
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();

4
src/main/java/com/zhgd/config/DataSourceTwoConfig.java
View File

@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerIntercept
import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import com.zhgd.xmgl.tenant.TenantHandler;
import org.apache.ibatis.logging.stdout.StdOutImpl;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan;
@ -21,7 +20,6 @@ import org.springframework.context.annotation.Primary;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import javax.annotation.Resource;
import javax.sql.DataSource;
@Configuration
@ -43,7 +41,7 @@ public class DataSourceTwoConfig {
//开启驼峰
MybatisConfiguration configuration = new MybatisConfiguration();
configuration.setMapUnderscoreToCamelCase(true);
configuration.setLogImpl(StdOutImpl.class);
configuration.setLogImpl(StdOutImplCustom.class);
bean.setConfiguration(configuration);
bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:com/wflow/**/*.xml"));
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();

17
src/main/java/com/zhgd/config/LogPrintFilter.java Normal file
View File

@ -0,0 +1,17 @@
package com.zhgd.config;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.filter.Filter;
import ch.qos.logback.core.spi.FilterReply;
public class LogPrintFilter extends Filter<ILoggingEvent> {
@Override
public FilterReply decide(ILoggingEvent event) {
if (StdOutImplCustom.isPrint()) {
return FilterReply.ACCEPT;
} else {
return FilterReply.DENY;
}
}
}

63
src/main/java/com/zhgd/config/StdOutImplCustom.java Normal file
View File

@ -0,0 +1,63 @@
package com.zhgd.config;
import com.zhgd.xmgl.config.TaskAspect;
import com.zhgd.xmgl.constant.Cts;
import com.zhgd.xmgl.util.ThreadLocalUtil;
import org.apache.ibatis.logging.Log;
import java.util.Objects;
import java.util.Optional;
public class StdOutImplCustom implements Log {
public StdOutImplCustom(String clazz) {
// Do Nothing
}
public static Boolean isPrint() {
if (!Objects.equals(TaskAspect.onlyPrintInterface, 1)) {
return true;
}
return Optional.ofNullable(ThreadLocalUtil.getByKey(Cts.IF_FROM_TASK_KEY, Boolean.class)).map(b -> !b).orElse(true);
}
@Override
public boolean isDebugEnabled() {
return isPrint();
}
@Override
public boolean isTraceEnabled() {
return isPrint();
}
@Override
public void error(String s, Throwable e) {
System.err.println(s);
e.printStackTrace(System.err);
}
@Override
public void error(String s) {
System.err.println(s);
}
@Override
public void debug(String s) {
if (isPrint()) {
System.out.println(s);
}
}
@Override
public void trace(String s) {
if (isPrint()) {
System.out.println(s);
}
}
@Override
public void warn(String s) {
System.out.println(s);
}
}

2
src/main/java/com/zhgd/interceptor/LogInterceptor.java
View File

@ -15,7 +15,7 @@ public class LogInterceptor implements HandlerInterceptor {
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
log.info("--------------------------------请求url：{}--------------------------------", request.getRequestURL());
log.info("请求url：{}--------------------------------", request.getRequestURL());
return true;
}

3
src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
View File

@ -78,7 +78,6 @@ import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
import java.util.*;
import java.util.concurrent.CompletableFuture;
@Slf4j
@RestController
@ -524,7 +523,6 @@ public class HikvisionCall {
@Async("getDoorEvents")
public void getDoorEventsAsync(String startTime, String endTime, JSONObject param, String projectSn, List<Project> projects) {
CompletableFuture.runAsync(() -> {
for (Project project : projects) {
List<UfaceDev> ufaceDevs = ufaceDevMapper.selectList(new LambdaQueryWrapper<UfaceDev>()
.eq(UfaceDev::getProjectSn, project.getProjectSn()));
@ -600,7 +598,6 @@ public class HikvisionCall {
}
}
log.info("服务挂了主动获取门禁点事件的人员通行记录执行完成，startTime：{}，endTime：{}", startTime, endTime);
});
}
@ApiOperation(value = "服务挂了主动获取查询过车记录", notes = "服务挂了主动获取查询过车记录", httpMethod = "POST")

11
src/main/java/com/zhgd/xmgl/config/TaskAspect.java
View File

@ -1,6 +1,8 @@
package com.zhgd.xmgl.config;
import com.zhgd.xmgl.constant.Cts;
import com.zhgd.xmgl.util.RequestIdUtil;
import com.zhgd.xmgl.util.ThreadLocalUtil;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
@ -8,6 +10,7 @@ import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.slf4j.MDC;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@ -18,6 +21,12 @@ import java.util.Map;
@Component
@Slf4j
public class TaskAspect {
public static Integer onlyPrintInterface;
@Value("${onlyPrintInterface:0}")
public void setOnlyPrintInterface(Integer onlyPrintInterface) {
TaskAspect.onlyPrintInterface = onlyPrintInterface;
}
@Pointcut("@annotation(org.springframework.scheduling.annotation.Scheduled)")
public void servicePointcut() {
@ -36,6 +45,7 @@ public class TaskAspect {
if (null == context) {
RequestIdUtil.setRequestId("-t"); //主线程没有MDC就自己生成一个
ThreadLocalUtil.addInKey(Cts.IF_FROM_TASK_KEY, true);
log.info("task方法开始:{}", methodName);
}
@ -60,6 +70,7 @@ public class TaskAspect {
if (null == context) {
log.info("task方法结束：{}", methodName);
RequestIdUtil.clear();
ThreadLocalUtil.remove();
}
}
}

1
src/main/java/com/zhgd/xmgl/constant/Cts.java
View File

@ -24,4 +24,5 @@ public interface Cts {
String TL_XZ_HIKVISION_COMPARE_DATA_RETRY = "tl_xz_hikvision_compare_data";
String TYPE = "type";
String TEAM_ID = "teamId";
String IF_FROM_TASK_KEY = "ifFromTaskKey";
}

22
src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzHikvisionCompareDataServiceImpl.java
View File

@ -168,12 +168,12 @@ public class XzHikvisionCompareDataServiceImpl extends ServiceImpl<XzHikvisionCo
*/
@Override
public void compareRetryFail() {
JSONObject tlJo = ThreadLocalUtil.getByKey(Cts.TL_XZ_HIKVISION_COMPARE_DATA_RETRY);
if (tlJo != null) {
XzHikvisionCompareData data = BeanUtil.toBean(tlJo, XzHikvisionCompareData.class);
data.setSyncResult(2);
xzHikvisionCompareDataMapper.updateById(data);
}
// JSONObject tlJo = ThreadLocalUtil.getByKey(Cts.TL_XZ_HIKVISION_COMPARE_DATA_RETRY);
// if (tlJo != null) {
// XzHikvisionCompareData data = BeanUtil.toBean(tlJo, XzHikvisionCompareData.class);
// data.setSyncResult(2);
// xzHikvisionCompareDataMapper.updateById(data);
// }
}
/**
@ -181,11 +181,11 @@ public class XzHikvisionCompareDataServiceImpl extends ServiceImpl<XzHikvisionCo
*/
@Override
public void compareRetrySuc() {
JSONObject tlJo = ThreadLocalUtil.getByKey(Cts.TL_XZ_HIKVISION_COMPARE_DATA_RETRY);
if (tlJo != null) {
XzHikvisionCompareData data = BeanUtil.toBean(tlJo, XzHikvisionCompareData.class);
xzHikvisionCompareDataMapper.deleteById(data.getId());
}
// JSONObject tlJo = ThreadLocalUtil.getByKey(Cts.TL_XZ_HIKVISION_COMPARE_DATA_RETRY);
// if (tlJo != null) {
// XzHikvisionCompareData data = BeanUtil.toBean(tlJo, XzHikvisionCompareData.class);
// xzHikvisionCompareDataMapper.deleteById(data.getId());
// }
}
@Override

4
src/main/java/com/zhgd/xmgl/util/ThreadLocalUtil.java
View File

@ -25,11 +25,11 @@ public class ThreadLocalUtil {
return get();
}
public static JSONObject getByKey(String key) {
public static <T> T getByKey(String key, Class<T> clz) {
if (get() == null) {
return null;
}
return get().getJSONObject(key);
return (T) get().get(key);
}
public static void add(JSONObject str) {

2
src/main/resources/application.properties
View File

@ -30,7 +30,7 @@ mybatis-plus.configuration.call-setters-on-nulls=true
spring.jackson.defaultPropertyInclusion=ALWAYS
# mybatis 配置
mybatis-plus.mapper-locations=classpath*:com/zhgd/xmgl/**/*.xml,classpath*:com/zhwl/zw/**/*.xml
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
mybatis-plus.configuration.log-impl=com.zhgd.config.StdOutImplCustom
# 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2)
#mybatis-plus.global-config.db-config.logic-delete-field=flag
mybatis-plus.global-config.db-config.logic-delete-value=1

4
src/main/resources/logback-spring.xml
View File

@ -6,8 +6,10 @@
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%X{requestId}][%thread] %highlight(%-5level) %method:%L %cyan(%logger{50}) - %highlight(%msg) %n</pattern>
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%highlight(%X{requestId})][%thread] %highlight(%-5level) %cyan(%logger{50}).%method:%L - %highlight(%msg) %n</pattern>
</encoder>
<filter class="com.zhgd.config.LogPrintFilter">
</filter>
</appender>
<!-- 时间滚动输出 level为 DEBUG 日志 -->