优化导入数据

liujun001
1 parent 8ca0bcc3
Showing 2 changed files with 8 additions and 2 deletions
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
@@ -419,7 +419,7 @@ public class ThreadJobService {
     public synchronized void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap, String timeOut, Date date, int type, Set<Long> idSets, String requestId) {
         JwtAuthenticationTokenFilter.putMDC("job", requestId);
 //        //查询当天是否保存过考情表  如果不存在则保存
-        List<DriverScheduling> bcList = schedulingMapper.queryToDay(DateUtil.YYYY_MM_DD_LINK.format(date), DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(date, 1)), null, null, null);
+//        List<DriverScheduling> bcList = schedulingMapper.queryToDay(DateUtil.YYYY_MM_DD_LINK.format(date), DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(date, 1)), null, null, null);
 //        Map<String, List<DriverScheduling>> dto = nowSchedulingCache.getCacheScheduling(ConstDateUtil.formatDate(date));
 //        if (CollectionUtils.isNotEmpty(bcList) && MapUtils.isEmpty(dto) && Objects.equals(1, type)) {
 //            String dateStr = DateUtil.YYYY_MM_DD.format(date);
@@ -438,7 +438,7 @@ public class ThreadJobService {
         if (Objects.equals(1, type)) {
             TempCache.resetMapStatus();
         }
-        bcList = getBcList(originSchedulingMap, type);
+        List<DriverScheduling> bcList = getBcList(originSchedulingMap, type);
  
         // 处理非司售人员的排班明细
         bcList.addAll(handleOtherPostsScheduling(type));
@@ -513,6 +513,9 @@ public class ThreadJobService {
             if (CollectionUtils.isNotEmpty(sourceList)) {
                 schedulings = schedulings.stream().filter(s -> {
                     Optional<LinggangScheduling> opt = sourceList.stream().filter(s1 -> s1.importEqus(s)).findFirst();
+                    if(opt.isPresent()){
+                        log.debug("排班数据已经存在:[{}]",s);
+                    }
                     return !opt.isPresent();
                 }).filter(s -> Objects.nonNull(s)).collect(Collectors.toList());
             }
@@ -315,6 +315,9 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
                 if (CollectionUtils.isNotEmpty(source)) {
                     locations = locations.stream().filter(l -> {
                         Optional<LinggangKeyWorkLocation> opt = source.stream().filter(s -> s.importEquals(l)).findFirst();
+                        if(opt.isPresent()){
+                            log.debug("钥匙存放数据已经存在:[{}]",l);
+                        }
                         return !opt.isPresent();
                     }).collect(Collectors.toList());
                 }