bug修改

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<RUploadDataLog> 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);
+            }
+        }
+    }
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadDataLogServiceImpl.java

@@ -28,7 +28,7 @@ public class RUploadDataLogServiceImpl extends MppServiceImpl<RUploadDataLogMapp
     @Override
     public Page<RUploadDataLog> getList(BaseParam baseParam) {
         LambdaQueryWrapper<RUploadDataLog> 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()));

pqs-harmonic/harmonic-boot/src/main/resources/com/njcn/harmonic/mapper/mapping/PmsTemProcessApprovalMapper.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.harmonic.mapper.upload.PmsTemProcessApprovalMapper">
-
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    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
-  </sql>
-</mapper>