Merge branch 'develop-16542' into 'develop'

Develop 16542

See merge request !351

project-order/src/main/java/com/dituhui/pea/order/common/CapacityUtils.java

 package com.dituhui.pea.order.common;
 
+import com.dituhui.pea.order.common.jackson.DateUtil;
 import com.dituhui.pea.order.dao.MapBlockInfoDao;
 import com.dituhui.pea.order.dao.SkillInfoDao;
+import com.dituhui.pea.order.dto.param.CapacityQueryDTO;
+import com.dituhui.pea.order.entity.CapacityEngineerSliceUsedEntity;
 import com.dituhui.pea.order.entity.MapBlockInfoEntity;
 import com.dituhui.pea.order.entity.SkillInfoEntity;
+import com.dituhui.pea.order.entity.TimeSliceEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
+import java.util.OptionalLong;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinTask;
 import java.util.stream.Collectors;
 
 @Component
@@ -58,4 +70,64 @@ public class CapacityUtils {
         return layers;
     }
 
+
+    public static List<CapacityQueryDTO.Segment> getEngineerTypeDay(List<TimeSliceEntity> typeTimeSlice,
+                                                                    List<CapacityEngineerSliceUsedEntity> engineerTimeSlice,
+                                                                    LocalDate date, int totalTakeTime) {
+
+        ForkJoinPool forkJoinPool = new ForkJoinPool(Runtime.getRuntime().availableProcessors());
+        //容量
+        ForkJoinTask<List<CapacityQueryDTO.Segment>> fork = forkJoinPool.submit(() -> typeTimeSlice.parallelStream()
+                .map(targetTimeSlice -> {
+                    final LocalTime targetStartTime = LocalTime.parse(targetTimeSlice.getStart(), DateUtil.TIME_FORMATTER);
+                    final LocalTime targetEndTime = LocalTime.parse(targetTimeSlice.getEnd(), DateUtil.TIME_FORMATTER);
+                    return caculateTargetTimeSlice(totalTakeTime, targetTimeSlice.getName(),
+                            engineerTimeSlice, targetStartTime, targetEndTime, date);
+                }).collect(Collectors.toList())).fork();
+
+        try {
+            return fork.get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new RuntimeException(e);
+        } finally {
+            forkJoinPool.shutdown();
+        }
+    }
+
+    public static CapacityQueryDTO.Segment caculateTargetTimeSlice(int totalTakeTime, String timeSliceName,
+                                                                   List<CapacityEngineerSliceUsedEntity> engineerTimeSlice,
+                                                                   LocalTime targetStartTime,
+                                                                   LocalTime targetEndTime, LocalDate targetDate) {
+
+        List<CapacityEngineerSliceUsedEntity> collect = engineerTimeSlice.parallelStream().filter(t -> {
+            TimeSliceEntity timeSlice = t.getTimmeSlice();
+            LocalTime sliceStartHour = LocalTime.parse(timeSlice.getStart(), DateUtil.TIME_FORMATTER);
+            LocalTime sliceEndHour = LocalTime.parse(timeSlice.getEnd(), DateUtil.TIME_FORMATTER);
+            return (targetStartTime.isAfter(sliceStartHour) && targetEndTime.isBefore(sliceEndHour)) ||
+                    (targetStartTime.equals(sliceStartHour) || targetEndTime.equals(sliceEndHour));
+        }).collect(Collectors.toList());
+
+        CapacityQueryDTO.Segment segment = new CapacityQueryDTO.Segment();
+        segment.setName(timeSliceName);
+        segment.setEndTime(DateUtil.toDate(LocalDateTime.of(targetDate, targetEndTime)));
+        segment.setBeginTime(DateUtil.toDate(LocalDateTime.of(targetDate, targetStartTime)));
+        if (!org.apache.commons.collections4.CollectionUtils.isEmpty(collect)) {
+            OptionalLong optionalLong = collect.stream().mapToLong(t -> {
+                Long maxDuration = t.getMaxDuration();
+                return Objects.isNull(maxDuration) ? 0L : maxDuration;
+            }).max();
+            long maxDuration = optionalLong.isEmpty() ? 0 : optionalLong.getAsLong();
+            segment.setMaxDuration(maxDuration);
+            long remain = collect.stream().mapToLong(CapacityEngineerSliceUsedEntity::getCapLeft).sum();
+            segment.setRemain(remain);
+            segment.setStatus(totalTakeTime <= maxDuration ? 1 : 0);
+        } else {
+            segment.setMaxDuration(0);
+            segment.setRemain(0);
+            segment.setStatus(0);
+        }
+        return segment;
+    }
+
+
 }

project-order/src/main/java/com/dituhui/pea/order/common/DateSplit.java

@@ -31,7 +31,7 @@ public class DateSplit {
     }
 
     public LocalDateTime getLocalEndDateTime() {
-        return DateUtil.fromDate(this.startDateTime);
+        return DateUtil.fromDate(this.endDateTime);
     }
 
     /**

project-order/src/main/java/com/dituhui/pea/order/scheduler/CalcEngineerCapacityScheduler.java

@@ -33,6 +33,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -123,7 +124,12 @@ public class CalcEngineerCapacityScheduler {
             final TimeSliceEntity timeSlice = sliceCap.getTimmeSlice();
             LocalTime sliceStartLocalTime = LocalTime.parse(timeSlice.getStart(), DateUtil.TIME_FORMATTER);
             LocalTime sliceEndLocalTime = LocalTime.parse(timeSlice.getEnd(), DateUtil.TIME_FORMATTER);
-            long lengthOfLeave = sliceCap.getCapTotal();
+            if (Objects.isNull(sliceCap.getCapTotal()) || 0 == sliceCap.getCapTotal()) {
+                log.info("-----------------》工程师{}的时间片总容量为0， 跳过容量计算", engineerCode);
+                continue;
+            }
+            long totalUseTime = 0;
+            long maxDuration = 0;
             for (OrderInfoEntity order : orders) {
                 LocalTime planStartTime = order.getPlanStartTime().toLocalTime();
                 LocalTime planEndTime = order.getPlanEndTime().toLocalTime();
@@ -135,22 +141,26 @@ public class CalcEngineerCapacityScheduler {
                 boolean contains = ss.contains(order.getOrderStatus());
                 //请假时间仅落在当前时间段内， 当前时间段请假时长为 请假结束时间- 请假开始时间
                 if (startIn && DateTimeUtil.isIn(planEndTime, sliceStartLocalTime, sliceEndLocalTime)) {
-                    lengthOfLeave = contains
-                            ?  lengthOfLeave - DateTimeUtil.betweenTwoTime(planStartTime, planEndTime, TimeUnit.MINUTES) :
-                    lengthOfLeave + DateTimeUtil.betweenTwoTime(planStartTime, planEndTime, TimeUnit.MINUTES);
+                    long useTime = DateTimeUtil.betweenTwoTime(planStartTime, planEndTime, TimeUnit.MINUTES);
+                    totalUseTime = contains
+                            ? totalUseTime + useTime : totalUseTime - useTime;
                 } else if (startIn && endAfter) {
                     //落在当前时间段和下一个时间段
-                    lengthOfLeave = contains
-                            ? lengthOfLeave - DateTimeUtil.betweenTwoTime(planStartTime, sliceEndLocalTime, TimeUnit.MINUTES)
-                            : lengthOfLeave +DateTimeUtil.betweenTwoTime(planStartTime, sliceEndLocalTime, TimeUnit.MINUTES);
+                    long useTime = DateTimeUtil.betweenTwoTime(planStartTime, sliceEndLocalTime, TimeUnit.MINUTES);
+                    totalUseTime = contains
+                            ? totalUseTime + useTime : totalUseTime - useTime;
                 } else if (planStartTime.isBefore(sliceStartLocalTime) && endAfter) {
-                    lengthOfLeave = contains
-                            ? lengthOfLeave - DateTimeUtil.betweenTwoTime(sliceStartLocalTime, sliceEndLocalTime, TimeUnit.MINUTES):
-                     lengthOfLeave + DateTimeUtil.betweenTwoTime(sliceStartLocalTime, sliceEndLocalTime, TimeUnit.MINUTES);
+                    long usedTime = DateTimeUtil.betweenTwoTime(sliceStartLocalTime, sliceEndLocalTime, TimeUnit.MINUTES);
+                    totalUseTime = contains
+                            ? totalUseTime + usedTime : totalUseTime - usedTime;
                 }
 
             }
-            sliceCap.setCapLeft(lengthOfLeave);
+            if (totalUseTime < 0) {
+                totalUseTime = 0;
+            }
+            sliceCap.setCapLeft(sliceCap.getCapTotal() - totalUseTime);
+            sliceCap.setMaxDuration(sliceCap.getCapTotal() - totalUseTime);
         }
         engineerSliceUsedCapacityDao.saveAll(engineerTimeSlice);
     }