自动执行计划事件任务优化

api/load-transfer-bf-api/src/main/java/com/hdkj/fhzg/response/AutoTaskCityDetailResponse.java

@@ -7,6 +7,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+
 /**
  * @author rj
  * @date 2026/3/10 15:47
@@ -23,7 +25,7 @@ public class AutoTaskCityDetailResponse {
     private String countryName;
     //线路总数
     @ExcelProperty("线路总数")
-    @ColumnWidth(10)
+    @ColumnWidth(15)
     private Integer feederTotal;
     //有联络线路总数
     @ExcelProperty("有联络线路总数")
@@ -36,7 +38,7 @@ public class AutoTaskCityDetailResponse {
     //调用成功率
     @ExcelProperty("调用成功率")
     @ColumnWidth(15)
-    private Integer simulationSuccessRate;
+    private BigDecimal simulationSuccessRate;
     //方案生成成功数
     @ExcelProperty("方案生成（有联络线路）")
     @ColumnWidth(30)
@@ -44,7 +46,7 @@ public class AutoTaskCityDetailResponse {
     //方案生成成功率
     @ExcelProperty("方案生成成功率")
     @ColumnWidth(20)
-    private Integer schemeSuccessRate;
+    private BigDecimal schemeSuccessRate;
     //成图成功数
     @ExcelProperty("方案成图")
     @ColumnWidth(15)
@@ -52,5 +54,5 @@ public class AutoTaskCityDetailResponse {
     //成图成功率
     @ExcelProperty("方案成图成功率")
     @ColumnWidth(20)
-    private Integer svgSuccessRate;
+    private BigDecimal svgSuccessRate;
 }

api/load-transfer-bf-api/src/main/java/com/hdkj/fhzg/response/AutoTaskCountryDetailResponse.java

@@ -3,6 +3,7 @@ package com.hdkj.fhzg.response;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -38,6 +39,7 @@ public class AutoTaskCountryDetailResponse {
     //创建时间
     @ExcelProperty("创建时间")
     @ColumnWidth(20)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
     //是否有联络
     @ExcelProperty("是否有联络")

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/FhzgAutoTaskCountryInfo.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 
 /**
@@ -53,17 +54,32 @@ public class FhzgAutoTaskCountryInfo implements Serializable {
     /**
      * 调用成功率
      */
-    private Integer simulationSuccessRate;
+    private Integer simulationSuccess;
+
+    /**
+     * 调用成功率
+     */
+    private BigDecimal simulationSuccessRate;
+
+    /**
+     * 方案生产成功率
+     */
+    private Integer schemeSuccess;
 
     /**
      * 方案生产成功率
      */
-    private Integer schemeSuccessRate;
+    private BigDecimal schemeSuccessRate;
+
+    /**
+     * 成图成功率
+     */
+    private Integer svgSuccess;
 
     /**
      * 成图成功率
      */
-    private Integer svgSuccessRate;
+    private BigDecimal svgSuccessRate;
 
     private LocalDate updateTime;
 

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/AutoTaskServiceImpl.java

@@ -3,7 +3,6 @@ package com.hdkj.lt.bf.service.impl;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.esotericsoftware.minlog.Log;
 import com.hdkj.fhzg.request.AutoTaskQueryPageRequest;
@@ -121,12 +120,12 @@ public class AutoTaskServiceImpl implements AutoTaskService {
             response.setCountryName(fhzgAutoTaskCountryInfo.getCountryName());
             response.setFeederTotal(fhzgAutoTaskCountryInfo.getFeederTotal());
             response.setContactFeederTotal(fhzgAutoTaskCountryInfo.getContactFeederTotal());
-            response.setSimulationSuccess(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
+            response.setSimulationSuccess(fhzgAutoTaskCountryInfo.getSimulationSuccess());
             response.setSimulationSuccessRate(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
-            response.setSchemeSuccess(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
-            response.setSchemeSuccessRate(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
-            response.setSvgSuccess(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
-            response.setSvgSuccessRate(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
+            response.setSchemeSuccess(fhzgAutoTaskCountryInfo.getSchemeSuccess());
+            response.setSchemeSuccessRate(fhzgAutoTaskCountryInfo.getSchemeSuccessRate());
+            response.setSvgSuccess(fhzgAutoTaskCountryInfo.getSvgSuccess());
+            response.setSvgSuccessRate(fhzgAutoTaskCountryInfo.getSvgSuccessRate());
             responseList.add(response);
         }
         return responseList;
@@ -239,12 +238,12 @@ public class AutoTaskServiceImpl implements AutoTaskService {
             response.setCountryName(fhzgAutoTaskCountryInfo.getCountryName());
             response.setFeederTotal(fhzgAutoTaskCountryInfo.getFeederTotal());
             response.setContactFeederTotal(fhzgAutoTaskCountryInfo.getContactFeederTotal());
-            response.setSimulationSuccess(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
+            response.setSimulationSuccess(fhzgAutoTaskCountryInfo.getSimulationSuccess());
             response.setSimulationSuccessRate(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
-            response.setSchemeSuccess(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
-            response.setSchemeSuccessRate(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
-            response.setSvgSuccess(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
-            response.setSvgSuccessRate(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
+            response.setSchemeSuccess(fhzgAutoTaskCountryInfo.getSchemeSuccess());
+            response.setSchemeSuccessRate(fhzgAutoTaskCountryInfo.getSchemeSuccessRate());
+            response.setSvgSuccess(fhzgAutoTaskCountryInfo.getSvgSuccess());
+            response.setSvgSuccessRate(fhzgAutoTaskCountryInfo.getSvgSuccessRate());
             responseList.add(response);
         }
         com.hdkj.fhzg.entity.Page<AutoTaskCityDetailResponse> result = new com.hdkj.fhzg.entity.Page<>();
@@ -262,7 +261,9 @@ public class AutoTaskServiceImpl implements AutoTaskService {
         queryWrapper.eq(StringUtils.isNotBlank(request.getFeederId()), FhzgAutoTaskPlanDetail::getFeederId, request.getFeederId());
         queryWrapper.eq(StringUtils.isNotBlank(request.getPlanNo()), FhzgAutoTaskPlanDetail::getPlanNo, request.getPlanNo());
         queryWrapper.like(StringUtils.isNotBlank(request.getFeederName()), FhzgAutoTaskPlanDetail::getFeederName, request.getFeederName());
-        queryWrapper.between(FhzgAutoTaskPlanDetail::getCreateTime, request.getStartTime(), request.getEndTime());
+        LocalDateTime startTime = request.getStartTime() == null ? LocalDateTime.now().minusMonths(1) : request.getStartTime();
+        LocalDateTime endTime = request.getEndTime() == null ? LocalDateTime.now() : request.getEndTime();
+        queryWrapper.between(FhzgAutoTaskPlanDetail::getCreateTime, startTime, endTime);
         queryWrapper.orderByAsc(FhzgAutoTaskPlanDetail::getIsHaveContact);
         queryWrapper.orderByAsc(FhzgAutoTaskPlanDetail::getIsSimulationSuccess);
         queryWrapper.orderByAsc(FhzgAutoTaskPlanDetail::getIsSchemeSuccess);
@@ -299,8 +300,8 @@ public class AutoTaskServiceImpl implements AutoTaskService {
             //导出地市统计数据
             LambdaQueryWrapper<FhzgAutoTaskCountryInfo> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(StringUtils.isNotBlank(request.getCityCode()), FhzgAutoTaskCountryInfo::getCityCode, request.getCityCode());
-            LocalDate startTime = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth());
-            LocalDate endTime = LocalDate.now().with(TemporalAdjusters.lastDayOfMonth());
+            LocalDate startTime = LocalDate.now().minusMonths(1);
+            LocalDate endTime = LocalDate.now();
             queryWrapper.between(FhzgAutoTaskCountryInfo::getUpdateTime, startTime, endTime);
             queryWrapper.orderByAsc(FhzgAutoTaskCountryInfo::getSimulationSuccessRate);
             List<FhzgAutoTaskCountryInfo> countryInfoList = autoTaskCountryInfoService.list(queryWrapper);
@@ -310,12 +311,12 @@ public class AutoTaskServiceImpl implements AutoTaskService {
                 cityDetailResponse.setCountryName(fhzgAutoTaskCountryInfo.getCountryName());
                 cityDetailResponse.setFeederTotal(fhzgAutoTaskCountryInfo.getFeederTotal());
                 cityDetailResponse.setContactFeederTotal(fhzgAutoTaskCountryInfo.getContactFeederTotal());
-                cityDetailResponse.setSimulationSuccess(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
+                cityDetailResponse.setSimulationSuccess(fhzgAutoTaskCountryInfo.getSimulationSuccess());
                 cityDetailResponse.setSimulationSuccessRate(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
-                cityDetailResponse.setSchemeSuccess(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
-                cityDetailResponse.setSchemeSuccessRate(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
-                cityDetailResponse.setSvgSuccess(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
-                cityDetailResponse.setSvgSuccessRate(fhzgAutoTaskCountryInfo.getSimulationSuccessRate());
+                cityDetailResponse.setSchemeSuccess(fhzgAutoTaskCountryInfo.getSchemeSuccess());
+                cityDetailResponse.setSchemeSuccessRate(fhzgAutoTaskCountryInfo.getSchemeSuccessRate());
+                cityDetailResponse.setSvgSuccess(fhzgAutoTaskCountryInfo.getSvgSuccess());
+                cityDetailResponse.setSvgSuccessRate(fhzgAutoTaskCountryInfo.getSvgSuccessRate());
                 responseList.add(cityDetailResponse);
             }
             String cityName = "";
@@ -446,4 +447,9 @@ public class AutoTaskServiceImpl implements AutoTaskService {
         }
     }
 
+
+    public void updateStaticData(){
+
+    }
+
 }