自动同步增加配置字段

zhaowenxuan

5 天以前 c01d278ca57650e57c235f96ab448292653db024

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

@@ -2,6 +2,7 @@

import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.db.DataSourceConfig;
import com.ltkj.db.DataSourceContextHolder;
@@ -73,7 +74,9 @@
    public void init() {
        DataSourceContextHolder.setDataSourceKey(DataSourceType.MASTER.name());
        // 获取所有需要同步日志的用户列表
        List<DictHosp> hospList = dictHospService.list();
        LambdaQueryWrapper<DictHosp> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(DictHosp::getIsAutoAsyncJg,1);
        List<DictHosp> hospList = dictHospService.list(wrapper);
        hospList.forEach(this::createTask);  // 为每个用户创建任务
        // 定时检查是否有新的用户需要添加任务
        schedulePeriodicTaskCheck();
@@ -127,7 +130,7 @@
                    log.info("任务开始执行时间 -> {}", dateTimeFormat.format(new Date()));
                    long start = System.currentTimeMillis();
                    // 查询任务数据
                    log.info("开始执行同步 执行数量->{}", 0);
                    log.info("开始执行同步 执行院区->{}", dictHosp.getCode());
                    List<String> jy = orderService.getDingShiTongBuJianYanTjNum();

                    List<String> jc = orderService.getDingShiTongBuJianChaTjNum();
@@ -159,7 +162,9 @@
                                if(null !=list && !list.isEmpty()){
                                    for (LtkjExamJcsqd jcsqd : list) {
                                        if(StringUtil.isNotBlank(jcsqd.getJgzt())){
                                            String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|；|;");
                                            String regex = configService.selectConfigByKey("jcycxmzz");
                                            if(StringUtil.isBlank(regex)) regex= "。|；|;|,|，";
                                            String[] split = jcsqd.getJgzt().replaceAll("\n", "").split(regex);
                                            for (String jg : split) {
                                                if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                                                        && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")
@@ -215,7 +220,9 @@
    // 检查并添加新的用户任务
    public void checkAndAddNewTasks() {
        // 获取所有需要同步日志的用户列表
        List<DictHosp> hospList = dictHospService.list();
        LambdaQueryWrapper<DictHosp> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(DictHosp::getIsAutoAsyncJg,1);
        List<DictHosp> hospList = dictHospService.list(wrapper);
        hospList.forEach(this::createTask);
        taskScheduler.schedule(this::checkAndAddNewTasks, Instant.now().plus(2, ChronoUnit.MINUTES));
    }
@@ -293,13 +300,15 @@

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