From 5f1f42f8d7cd3aa9e63805d1ad2b4e45e1d13a40 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Mon, 21 Apr 2025 15:44:26 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/upload/impl/FailedAttemptJob.java | 79 +++++++++++++++++++ .../impl/RUploadDataLogServiceImpl.java | 2 +- .../mapping/PmsTemProcessApprovalMapper.xml | 11 --- 3 files changed, 80 insertions(+), 12 deletions(-) create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/FailedAttemptJob.java delete mode 100644 pqs-harmonic/harmonic-boot/src/main/resources/com/njcn/harmonic/mapper/mapping/PmsTemProcessApprovalMapper.xml diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/FailedAttemptJob.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/FailedAttemptJob.java new file mode 100644 index 000000000..255ce6d70 --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/FailedAttemptJob.java @@ -0,0 +1,79 @@ +package com.njcn.harmonic.service.upload.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.njcn.advance.pojo.dto.waveAnalysis.AnalyWave; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.harmonic.api.UploadGwDataFeignClient; +import com.njcn.harmonic.pojo.param.UploadParam; +import com.njcn.harmonic.pojo.po.upload.RUploadDataLog; +import com.njcn.harmonic.service.upload.IPointStatisticalDataService; +import com.njcn.harmonic.service.upload.IRUploadDataLogService; +import lombok.RequiredArgsConstructor; +import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Date; +import java.util.List; +import java.util.Objects; + +/** + * @Author: cdf + * @CreateTime: 2025-04-21 + * @Description: 主网测点失败尝试 + */ +@Component +@EnableScheduling +@RequiredArgsConstructor +public class FailedAttemptJob { + + private static final Logger logger = LoggerFactory.getLogger(FailedAttemptJob.class); + + private final IRUploadDataLogService irUploadDataLogService; + + private final IPointStatisticalDataService iPointStatisticalDataService; + + + // 每天早上 8 点执行 + @Scheduled(cron = "0 05 8 * * ?") + public void executeAtEight() { + commFunction(); + } + + // 每天早上 9 点执行 + @Scheduled(cron = "0 10 8 * * ?") + public void executeAtNine() { + commFunction(); + } + + // 每天早上 10 点执行 + @Scheduled(cron = "0 15 8 * * ?") + public void executeAtTen() { + commFunction(); + } + + + + private void commFunction(){ + System.out.println("早上定时任务执行(主网测点失败尝试)：" + LocalDateTime.now()); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(RUploadDataLog::getStatisticDate, LocalDate.now().minusDays(1)).eq(RUploadDataLog::getBigType,0).eq(RUploadDataLog::getSmallType,1); + RUploadDataLog rUploadDataLog = irUploadDataLogService.getOne(lambdaQueryWrapper); + if(Objects.nonNull(rUploadDataLog)){ + if(rUploadDataLog.getResult().equals(0)){ + //失败了需要重试 + UploadParam param = new UploadParam(); + param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN)); + iPointStatisticalDataService.uploadPointStatisticalData(param); + } + } + } +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadDataLogServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadDataLogServiceImpl.java index 4c7203b08..bd97c7925 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadDataLogServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadDataLogServiceImpl.java @@ -28,7 +28,7 @@ public class RUploadDataLogServiceImpl extends MppServiceImpl getList(BaseParam baseParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.between(RUploadDataLog::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(baseParam.getSearchBeginTime())),DateUtil.endOfDay(DateUtil.parse(baseParam.getSearchEndTime()))) + lambdaQueryWrapper.between(RUploadDataLog::getStatisticDate, DateUtil.beginOfDay(DateUtil.parse(baseParam.getSearchBeginTime())),DateUtil.endOfDay(DateUtil.parse(baseParam.getSearchEndTime()))) .orderByDesc(RUploadDataLog::getStatisticDate); if(StrUtil.isNotBlank(baseParam.getSearchValue())){ lambdaQueryWrapper.eq(RUploadDataLog::getSmallType,Integer.parseInt(baseParam.getSearchValue())); diff --git a/pqs-harmonic/harmonic-boot/src/main/resources/com/njcn/harmonic/mapper/mapping/PmsTemProcessApprovalMapper.xml b/pqs-harmonic/harmonic-boot/src/main/resources/com/njcn/harmonic/mapper/mapping/PmsTemProcessApprovalMapper.xml deleted file mode 100644 index 5b8dd5395..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/resources/com/njcn/harmonic/mapper/mapping/PmsTemProcessApprovalMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - obj_id, temp_user_dossier_id, approval_join_user_id, approval_join_user_name, approval_advise, - create_time, update_time, legacy_problem, rectification_status, rectification_time, - rectification_user_id, rectification_user_name, rectification_measure - - \ No newline at end of file