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

@@ -95,15 +95,17 @@
        // 将该用户ID添加到已调度任务集合中
        scheduledTasks.add(dictHosp.getCode());
        // 创建定时任务，任务将在15分钟后执行
        taskScheduler.schedule(() -> {
/*        taskScheduler.schedule(() -> {
            try {
                // 执行任务的超时控制
                taskScheduler.schedule(() -> {
                    executeTask(dictHosp);
                }, Instant.now());

            } catch (Exception e) {
                log.error("创建任务时发生异常：{}", e.getMessage());
            }
        }, Instant.now().plus(15, ChronoUnit.MINUTES));*/
        log.info("任务创建成功 ->{}",dictHosp.getCode());
        // 执行任务的超时控制
        taskScheduler.schedule(() -> {
            executeTask(dictHosp);
        }, Instant.now().plus(15, ChronoUnit.MINUTES));
    }

@@ -127,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());
@@ -137,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());
                        }
@@ -145,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());
                        }
@@ -153,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) {
@@ -186,7 +188,7 @@
                            }
                        }
                        long end = System.currentTimeMillis();
                        log.info("同步结束 耗时：{}秒", (end - start) / 1000);
                        log.info("{}同步结束 耗时：{}秒",dictHosp.getCode(), (end - start) / 1000);
                    }else {
                        log.info("执行存储过程出参失败");
                    }
@@ -219,10 +221,12 @@

    // 检查并添加新的用户任务
    public void checkAndAddNewTasks() {
        DataSourceContextHolder.setDataSourceKey(DataSourceType.MASTER.name());
        // 获取所有需要同步日志的用户列表
        LambdaQueryWrapper<DictHosp> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(DictHosp::getIsAutoAsyncJg,1);
        List<DictHosp> hospList = dictHospService.list(wrapper);
        log.info("检查并添加需要同步的医院列表:{}", JSONUtil.toJsonStr(hospList));
        hospList.forEach(this::createTask);
        taskScheduler.schedule(this::checkAndAddNewTasks, Instant.now().plus(2, ChronoUnit.MINUTES));
    }
@@ -300,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);
@@ -308,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-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java

@@ -1943,6 +1943,15 @@
    }


    @GetMapping("/zongjianyishengHuiFuyichangxiangmuanniu")
    @ApiOperation(value = "总检恢复异常项目按钮接口")
    public AjaxResult zongjianyishengHuiFuyichangxiangmuanniu(@RequestParam String id) {

        int a = ycxmService.zongjianyishengHuiFuyichangxiangmuanniu(id);
        return AjaxResult.success(a);
    }



    @GetMapping("/csymxmxzqtyybcjk")
    @ApiOperation(value = "初审页面项目选择其他原因保存接口")

 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; // 根据上下文获取当前数据源的键
    }


 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java

@@ -5,6 +5,7 @@
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;

import java.util.List;

@@ -26,4 +27,9 @@

    @Select("select * FROM tj_order_ycxm WHERE tjh=#{tjNum} and deleted=1")
    List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum);

    @Update("update  tj_order_ycxm a set" +
            "  a.deleted=0 " +
            "  where  a.id=id")
    int zongjianyishengHuiFuyichangxiangmuanniu(String id);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java

@@ -19,4 +19,6 @@
    List<TjOrderYcxm> selectListByTjh(String tjNumber);

    List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum);

    int zongjianyishengHuiFuyichangxiangmuanniu(String id);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java

@@ -36,4 +36,9 @@
    public List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum) {
        return mapper.zongjianyishengHuiFuyichangxiangmu(tjNum);
    }

    @Override
    public int zongjianyishengHuiFuyichangxiangmuanniu(String id) {
        return mapper.zongjianyishengHuiFuyichangxiangmuanniu(id);
    }
}