feat: 按照时间段导出日期

guzijian
1 parent 253d1832
Showing 6 changed files with 101 additions and 3 deletions
Bsth-admin/src/main/java/com/ruoyi/common/ReportProperties.java
Bsth-admin/src/main/java/com/ruoyi/driver/mapper/DriverSchedulingMapper.java
Bsth-admin/src/main/java/com/ruoyi/pojo/request/ReportViewRequestVo.java
Bsth-admin/src/main/java/com/ruoyi/pojo/response/ExportReportViewResponseVo.java
Bsth-admin/src/main/java/com/ruoyi/service/ReportService.java
Bsth-admin/src/main/resources/mapper/driver_scheduling/DriverSchedulingMapper.xml
@@ -4,4 +4,5 @@ public interface ReportProperties {
     Integer NOW = 0;
     Integer DAY = 1;
     Integer MONTH = 2;
+    Integer TIME_PERIOD = 3;
 }
@@ -2,6 +2,7 @@ package com.ruoyi.driver.mapper;
 import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.pojo.response.ExportReportViewResponseVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -29,5 +30,6 @@ public interface DriverSchedulingMapper {
     @Select("select count(*) from equipment")
     Integer queryNumberByDevice();
-    void updateDriverInfo(@Param("driver") Driver driver,@Param("date")String date);
+
+    List<DriverScheduling> queryByMonth(@Param("startDate") String startDate,@Param("endDate") String endDate);
 }
@@ -49,4 +49,10 @@ public class ReportViewRequestVo {
     @ApiModelProperty("查询各个阶段超时的人员 0 全部 1 第一次打卡 2 第二卡打卡 3 第三次打卡 4 第四次打卡")
     Integer stage;
+    @ApiModelProperty("开始时间")
+    String startDate;
+
+    @ApiModelProperty("结束时间")
+    String endDate;
+
 }
@@ -4,11 +4,13 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.domain.DriverScheduling;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -157,6 +159,8 @@ public class ExportReportViewResponseVo {
     @ApiModelProperty("排班日期")
     @ExcelProperty(value = "排班日期")
     @ColumnWidth(20)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date scheduleDate;
     public ExportReportViewResponseVo(List<DriverScheduling> driverScheduling) {
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.ruoyi.common.global.Result;
 import com.ruoyi.common.global.ResultCode;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.eexception.mapper.EquipmentExceptionMapper;
@@ -27,7 +28,11 @@ import javax.validation.constraints.NotBlank;
 import java.time.LocalDate;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -35,8 +40,7 @@ import java.util.stream.Collectors;
 import static com.ruoyi.common.ApiProperties.PERSONNEL_API_KEY;
 import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
 import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
-import static com.ruoyi.common.ReportProperties.DAY;
-import static com.ruoyi.common.ReportProperties.MONTH;
+import static com.ruoyi.common.ReportProperties.*;
 /**
  * @author 20412
@@ -101,9 +105,74 @@ public class ReportService {
         else if (requestVo.getExportFlag().equals(MONTH)) {
             return getMonthReportTableResponseVo(requestVo);
         }
+        // 处理导出任意时间段  后台追加限制条件 366 天为最长导出时间
+        else if (requestVo.getExportFlag().equals(TIME_PERIOD)) {
+            return getTimePeriodReportTableResponseVo(requestVo);
+        }
         return null;
     }
+    private List<ExportReportViewResponseVo> getTimePeriodReportTableResponseVo(ReportViewRequestVo requestVo) {
+        String startDate = requestVo.getStartDate();
+        String endDate = requestVo.getEndDate();
+        LocalDate startLocalDate = LocalDate.parse(startDate);
+        LocalDate endLocalDate = LocalDate.parse(endDate);
+
+        long days = ChronoUnit.DAYS.between(startLocalDate, endLocalDate);
+        long timePeriod = 366;
+        if (days > timePeriod) {
+            throw new RuntimeException("时间段不能超过" + timePeriod + "天");
+        }
+        List<ExportReportViewResponseVo> voList = new ArrayList<>();
+        // 分段查询
+        spiteQueryResult(startLocalDate, endLocalDate, voList);
+
+        return voList;
+    }
+
+    private void spiteQueryResult(LocalDate startLocalDate, LocalDate endLocalDate, List<ExportReportViewResponseVo> voList) {
+        // 1 时间按月分段
+        String split = "p";
+        List<String> localDates = splitByMonth(startLocalDate, endLocalDate, split);
+        // 2 按月创建多线程
+        ExecutorService pool = Executors.newFixedThreadPool(localDates.size());
+        // 3
+        for (String date : localDates) {
+            pool.execute(new Runnable() {
+                @Override
+                public void run() {
+                    String[] dateSplit = date.split(split);
+                    List<DriverScheduling> vos = schedulingMapper.queryByMonth(dateSplit[0], dateSplit[1]);
+                    Map<String, List<DriverScheduling>> resultMap = new HashMap<>();
+                    handlerResultMap(resultMap, vos);
+                    handleResultList(voList, resultMap);
+                }
+            });
+        }
+        pool.shutdown();
+        try {
+            // 等待所有任务执行完毕或超时
+            pool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
+        } catch (InterruptedException e) {
+            throw new RuntimeException("导出失败，请尝试刷新页面重新导出或者联系管理员");
+        }
+    }
+
+    private static List<String> splitByMonth(LocalDate startDate, LocalDate endDate, String split) {
+        List<String> dates = new ArrayList<>();
+        LocalDate currentMonthStart = startDate;
+        LocalDate currentMonthEnd;
+        while (currentMonthStart.isBefore(endDate) || currentMonthStart.isEqual(endDate)) {
+            currentMonthEnd = currentMonthStart.withDayOfMonth(currentMonthStart.lengthOfMonth());
+            if (currentMonthEnd.isAfter(endDate)) {
+                currentMonthEnd = endDate;
+            }
+            dates.add(currentMonthStart + split + currentMonthEnd);
+            currentMonthStart = currentMonthEnd.plusDays(1);
+        }
+        return dates;
+    }
+
     private List<ExportReportViewResponseVo> getDayReportTableResponseVo(String date) {
         List<DriverScheduling> schedulingList = schedulingMapper.queryToDay(date, null, null, null);
         Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
@@ -131,6 +200,17 @@ public class ReportService {
         }
     }
+    private void handlerResultMap(Map<String, List<DriverScheduling>> resultMap, List<DriverScheduling> schedulingList) {
+        for (DriverScheduling item : schedulingList) {
+            String key = item.getScheduleDate() + item.getJobCode();
+            if (Objects.isNull(resultMap.get(key))) {
+                resultMap.put(key, new ArrayList<>(Arrays.asList(item)));
+            } else {
+                resultMap.get(key).add(item);
+            }
+        }
+    }
+
     private List<ExportReportViewResponseVo> getMonthReportTableResponseVo(ReportViewRequestVo requestVo) {
         List<ExportReportViewResponseVo> responseVos = new ArrayList<>(10000);
         List<String> days = getNowMonthAllDay(requestVo.getDate());
@@ -70,4 +70,9 @@
         </if>
     </select>
+    <select id="queryByMonth" resultType="com.ruoyi.domain.DriverScheduling" resultMap="Scheduling">
+        select scheduling.*,driver.fleet_name fleetName from
+        scheduling left join driver on driver.job_code = scheduling.job_code
+        where schedule_date &gt;= #{startDate} and schedule_date &lt;= #{endDate}
+    </select>
 </mapper>
 \ No newline at end of file