update gitignore

kongzy

2024-08-14 135a322f44708b1187d37ea4b6859b5d82113e89

 src/main/java/com/ruoyi/project/tr/HiddenDangerCheckJob/util/AbstractQuartzJob.java

@@ -54,10 +54,9 @@

    JpushService jpushService;

    @Autowired
    private RiskService riskService;
    @Autowired
    private IRiskListService iRiskListService;
    RiskService riskService;

    IRiskListService iRiskListService;


    /**
@@ -109,7 +108,11 @@
        jobLog.setInvokeTarget(job.getInvokeTarget());
        jobLog.setStartTime(startTime);
        jobLog.setEndTime(new Date());
        long runMs = jobLog.getEndTime().getTime() - jobLog.getStartTime().getTime();

        System.out.println(startTime);
        System.out.println(jobLog.getEndTime());

        long runMs = jobLog.getEndTime().getTime() - jobLog.getStartTime().getTime(); // todo -2022 检查此处异常来源
        jobLog.setJobMessage(jobLog.getJobName() + " 总共耗时：" + runMs + "毫秒");
        if (e != null) {
            jobLog.setStatus(Constants.FAIL);
@@ -130,7 +133,7 @@
     * */
    //生成定时隐患排查数据
    @Transactional
    protected void createData(JobExecutionContext context, HiddenDangerCheckJob job) {
    public void createData(JobExecutionContext context, HiddenDangerCheckJob job) {
        Date startTime = threadLocal.get();

        //比较当前时间与执行开始时间
@@ -163,9 +166,9 @@
                if ("1".equals(job.getCheckType())) {
                    hdc.setRiskId(job.getRiskId() != null ? Long.valueOf(job.getRiskId()) : -1);//风险单元ID

                    // todo-2022 ,基础排除清单名称-》改用基础清单表中信息
                    RiskList infoByRiskId = iRiskListService.getInfoByRiskId(job.getRiskId());
                    hdc.setRiskName(infoByRiskId.getRiskListName());//风险单元名称
                    // todo-2022 , 基础排除清单名称-》改用基础清单表中信息    “需要改动”（现在的情况是，清单调整后，依然使用第一次新建时读取的job的名字）
//                    RiskList infoByRiskId = iRiskListService.getInfoByRiskId(job.getRiskId());
                    hdc.setRiskName(job.getRiskName());//风险单元名称

                    hdc.setDangerPlaceId(job.getRiskPlaceId());//风险单元地点ID
                    hdc.setDangerPlaceName(job.getRiskPlaceName());//风险单元地点名称
@@ -185,12 +188,15 @@
                    hdc.setCompanyId(job.getCompanyId());
                    insertHiddenDangerCheckPoint(hdc);

                    System.out.println("【-】开始调用方法，处理任务附属表");
                    // todo-2022 插入 任务附属表  写到此处
                     hdc.getCheckId();
                    int result = riskService.insertDangerCheckLog(hdc.getCheckId(), hdc);
                    int result = SpringUtils.getBean(RiskService.class).insertDangerCheckLog(hdc.getCheckId(), hdc);
//                    int result = riskService.insertDangerCheckLog(hdc.getCheckId(), hdc);
                    if (result < 1){
                        throw new RuntimeException("定时任务生产失败");
                    }
                    System.out.println("【-】开始调用方法，任务附属表处理完成");

                } else if ("2".equals(job.getCheckType())) {
                    String[] riskIdArray = job.getRiskId().split(",");
@@ -220,6 +226,15 @@
                        hdc.setCompanyId(job.getCompanyId());
                        insertHiddenDangerCheckPoint(hdc);

                        System.out.println("【-】开始调用方法，处理任务附属表");
                        // todo-2022 插入 任务附属表  写到此处
                        hdc.getCheckId();
                        int result = SpringUtils.getBean(RiskService.class).insertDangerCheckLog(hdc.getCheckId(), hdc);
//                    int result = riskService.insertDangerCheckLog(hdc.getCheckId(), hdc);
                        if (result < 1){
                            throw new RuntimeException("定时任务生产失败");
                        }
                        System.out.println("【-】开始调用方法，任务附属表处理完成");
                    }
                }
                scheduleJPush(hdc);//定时任务 推送
@@ -258,7 +273,12 @@
                        hdcp.getId();

                        // todo-2022 现场核查清单对应的核查点信息
                        riskService.insertCheckAndMeasure(hdcp.getId(), hdcp);
                        System.out.println("【***】开始调用方法，处理核查点附属表");
                        int result = SpringUtils.getBean(RiskService.class).insertCheckAndMeasure(hdcp.getId(), hdcp);
//                        int result = riskService.insertCheckAndMeasure(hdcp.getId(), hdcp);
                        if (result < 1){
                            throw new RuntimeException("【***】保存核查点关联信息失败");
                        }
                    }
                });

@@ -285,6 +305,14 @@
//                hdcp.setDangerSources(TrHiddenDangerCheckConstants.DANGER_SOURCES_SCHEDULE_PRODUCE);//隐患来源(定时器任务生成)
                        // 写入数据库当中
                        SpringUtils.getBean(IHiddenDangerCheckPointService.class).insertHiddenDangerCheckPoint(hdcp);

                        // todo-2022 现场核查清单对应的核查点信息
                        System.out.println("【***】开始调用方法，处理核查点附属表");
                        int result = SpringUtils.getBean(RiskService.class).insertCheckAndMeasure(hdcp.getId(), hdcp);
//                        int result = riskService.insertCheckAndMeasure(hdcp.getId(), hdcp);
                        if (result < 1){
                            throw new RuntimeException("【***】保存核查点关联信息失败");
                        }
                    }
                });
            }