调整切库日志打印

zhaowenxuan

昨天 aa98dc5f2e5fb3ffed6a2d4e52070ea1518db1b4

调整切库日志打印

 ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java

@@ -129,7 +129,7 @@
            boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj);
            if (!panduandangqianshijian) {
                if (lock) {
                    log.info("任务开始执行时间 -> {}", dateTimeFormat.format(new Date()));
                    log.info("{}任务开始执行时间 -> {}",dictHosp.getCode(), dateTimeFormat.format(new Date()));
                    long start = System.currentTimeMillis();
                    // 查询任务数据
                    log.info("开始执行同步 执行院区->{}", dictHosp.getCode());
@@ -139,7 +139,7 @@


                    if (null != jy && !jy.isEmpty()) {
                        log.info("同步检验人员 执行数量->{}", jy.size());
                        log.info("{}同步检验人员 执行数量->{}{}",dictHosp.getCode(), jy.size(),JSONUtil.toJsonStr(jy));
                        for (String s : jy) {
                            extractedjianyan(s,dictHosp.getCode());
                        }
@@ -147,7 +147,7 @@


                    if (null != jc && !jc.isEmpty()) {
                        log.info("同步检查人员 执行数量->{}", jc.size());
                        log.info("{}同步检查人员 执行数量->{}{}",dictHosp.getCode(), jc.size(),JSONUtil.toJsonStr(jc));
                        for (String s : jc) {
                            extractedjiancha(s,dictHosp.getCode());
                        }
@@ -155,7 +155,7 @@
                    Map<String, Object> map = new HashMap<>();
                    testMapper.tjplUpdateDetatilByVi(map);
                    Integer object = (Integer) map.get("total");
                    log.info("执行存储过程后出参->{}", object);
                    log.info("{}执行存储过程后出参->{}",dictHosp.getCode(), object);
                    if (null != object && object.equals(1)) {
                        if (null != jc && !jc.isEmpty()) {
                            for (String s : jc) {
@@ -188,7 +188,7 @@
                            }
                        }
                        long end = System.currentTimeMillis();
                        log.info("同步结束 耗时：{}秒", (end - start) / 1000);
                        log.info("{}同步结束 耗时：{}秒",dictHosp.getCode(), (end - start) / 1000);
                    }else {
                        log.info("执行存储过程出参失败");
                    }
@@ -304,7 +304,7 @@

        try {
            List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,hospId);
            log.info("自动同步检查申请单数据:"+jcsqdList);
            log.info("{}自动同步检查申请单数据:{}",hospId,JSONUtil.toJsonStr(jcsqdList));
            if (null != jcsqdList && !jcsqdList.isEmpty()) {
                DynamicDataSourceContextHolder.clearDataSourceType();
                jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
@@ -312,7 +312,7 @@
                jcsqdService.saveBatch(jcsqdList);
                List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,hospId);
//                DynamicDataSourceContextHolder.clearDataSourceType();
                log.info("自动同步检查报告单数据:"+jcbgdList);
                log.info("{}自动同步检查报告单数据:{}",hospId,JSONUtil.toJsonStr(jcbgdList));
                if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
                DynamicDataSourceContextHolder.clearDataSourceType();
            }

 ltkj-framework/src/main/java/com/ltkj/framework/aspectj/DataSourceAspect.java

@@ -37,9 +37,9 @@
    @Around("dsPointCut()")
    public Object around(ProceedingJoinPoint point) throws Throwable {
        String key = DataSourceContextHolder.getDataSourceKey();
        logger.info("执行之前");
        logger.info("DataSourceContextHolder ->{}",key);
        logger.info("DynamicDataSourceContextHolder ->{}",DynamicDataSourceContextHolder.getDataSourceType());
//        logger.info("执行之前");
//        logger.info("DataSourceContextHolder ->{}",key);
//        logger.info("DynamicDataSourceContextHolder ->{}",DynamicDataSourceContextHolder.getDataSourceType());
        DataSource dataSource = getDataSource(point);

        if (StringUtils.isNotNull(dataSource)) {
@@ -50,15 +50,15 @@
        try {
            return point.proceed();
        } finally {
            logger.info("执行之后");
            logger.info("DataSourceContextHolder ->{}",key);
            logger.info("DynamicDataSourceContextHolder ->{}",DynamicDataSourceContextHolder.getDataSourceType());
//            logger.info("执行之后");
//            logger.info("DataSourceContextHolder ->{}",key);
//            logger.info("DynamicDataSourceContextHolder ->{}",DynamicDataSourceContextHolder.getDataSourceType());
            // 销毁数据源 在执行方法之后
            DataSourceContextHolder.setDataSourceKey(key);
            DynamicDataSourceContextHolder.setDataSourceType(key);
            logger.info("执行之后 clear之后");
            logger.info("DataSourceContextHolder ->{}",key);
            logger.info("DynamicDataSourceContextHolder ->{}",DynamicDataSourceContextHolder.getDataSourceType());
//            logger.info("执行之后 clear之后");
//            logger.info("DataSourceContextHolder ->{}",key);
//            logger.info("DynamicDataSourceContextHolder ->{}",DynamicDataSourceContextHolder.getDataSourceType());
        }
    }


 ltkj-hosp/src/main/java/com/ltkj/db/HospDynamicDataSource.java

@@ -14,7 +14,7 @@
    @Override
    protected Object determineCurrentLookupKey() {
        String key = DataSourceContextHolder.getDataSourceKey();
        log.info("当前数据源 ->{}",key);
//        log.info("当前数据源 ->{}",key);
        return key; // 根据上下文获取当前数据源的键
    }