优化导入数据

liujun001
1 parent e12f6a7c
Showing 5 changed files with 86 additions and 49 deletions
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/LinggangKeyWorkLocation.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/LinggangScheduling.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
@@ -122,6 +122,15 @@ public class LinggangKeyWorkLocation {
     @TableField(exist = false)
     private Collection<Integer> keyInfoIds;
+    public boolean importEquals(LinggangKeyWorkLocation location) {
+        if (Objects.isNull(location)) {
+            return false;
+        }
+
+        return Objects.equals(this.yardId, location.getYardId()) && Objects.equals(this.device, location.getDevice()) && Objects.equals(this.keyInfoId, location.getKeyInfoId())
+                && Objects.equals(this.scheduleDate, location.getScheduleDate()) && Objects.equals(this.schedulingId, location.getSchedulingId()) && Objects.equals(this.type, location.getType());
+    }
+
     public enum LinggangKeyWorkLocationEventTypeEnum {
         TAKE_OUT(0, "取出"),
@@ -167,7 +176,7 @@ public class LinggangKeyWorkLocation {
         TAKE_OUT(0, "取出"),
         REPAY(1, "归还"),
-        
+
         ;
         private String label;
@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import java.util.Date;
+import java.util.Objects;
 @Data
@@ -163,7 +164,16 @@ public class LinggangScheduling {
     }
-
+    public  boolean importEqus(LinggangScheduling linggangScheduling){
+        if(Objects.isNull(linggangScheduling)){
+            return false;
+        }
+        return Objects.equals(this.getScheduleDate(),linggangScheduling.getScheduleDate()) && Objects.equals(this.lineName,linggangScheduling.getLineName())
+                && Objects.equals(this.jobCode,linggangScheduling.getJobCode())  && Objects.equals(this.name,linggangScheduling.getName()) && Objects.equals(this.posts,linggangScheduling.getPosts())
+                && Objects.equals(this.lpName,linggangScheduling.getLpName()) && Objects.equals(this.nbbm,linggangScheduling.getNbbm()) && Objects.equals(this.getBcType(),linggangScheduling.getBcType())
+                && Objects.equals(this.fcsjT,linggangScheduling.getFcsjT()) && Objects.equals(this.zdsjT,linggangScheduling.getZdsjT()) && Objects.equals(this.qdzcode,linggangScheduling.getQdzcode())
+                && Objects.equals(this.zdzcode,linggangScheduling.getZdzcode());
+    }
     @Override
     public String toString() {
@@ -8,7 +8,6 @@ import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.cache.SchedulingCache;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.service.IDriverService;
@@ -282,15 +281,7 @@ public class DriverJob implements InitializingBean {
             idSets = linggangSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
         }
-        scheduling.setType(type);
-        if(Objects.isNull(schedulingService)){
-            schedulingService = SpringUtils.getBean(LinggangSchedulingService.class);
-        }
-        Integer count = schedulingService.countId(scheduling);
-        if (Objects.nonNull(count) && count > 0) {
-            log.info("[{}]排班数据已经存在:[{}]", date,count);
-            return;
-        }
+
@@ -42,7 +42,6 @@ import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -417,24 +416,24 @@ public class ThreadJobService {
      */
     @Async
     @Transactional(rollbackFor = {Exception.class})
-    public synchronized void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap, String timeOut, Date date, int type,Set<Long> idSets,String requestId) {
-        JwtAuthenticationTokenFilter.putMDC("job",requestId);
-        //查询当天是否保存过考情表  如果不存在则保存
+    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);
-        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);
-            Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
-            NowSchedulingCache.handlerResultMap(resultMap, bcList);
-            // 更新缓存
-            nowSchedulingCache.setCacheScheduling(dateStr, resultMap);
-        }
+//        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);
+//            Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
+//            NowSchedulingCache.handlerResultMap(resultMap, bcList);
+//            // 更新缓存
+//            nowSchedulingCache.setCacheScheduling(dateStr, resultMap);
+//        }
-        // 当天已有记录则不在保存  或者 调度记录为空则不在保存
-        if ((CollectionUtil.isNotEmpty(dto) && CollectionUtil.isNotEmpty(bcList)) || originSchedulingMap.size() == 0) {
-            log.info("调度最新数据：{},当天获取数据：{},时间:[{}]", originSchedulingMap.size(), bcList.size(), date);
-            return;
-        }
+//        // 当天已有记录则不在保存  或者 调度记录为空则不在保存
+//        if ((CollectionUtil.isNotEmpty(dto) && CollectionUtil.isNotEmpty(bcList)) || originSchedulingMap.size() == 0) {
+//            log.info("调度最新数据：{},当天获取数据：{},时间:[{}]", originSchedulingMap.size(), bcList.size(), date);
+//            return;
+//        }
         if (Objects.equals(1, type)) {
             TempCache.resetMapStatus();
@@ -504,7 +503,23 @@ public class ThreadJobService {
                 }
             }
-            schedulingService.saveBatch(schedulings);
+            LinggangScheduling scheduling = new LinggangScheduling();
+            scheduling.setStartScheduleDate(DateUtil.shortDate(date));
+            scheduling.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
+
+            scheduling.setType(type);
+
+            List<LinggangScheduling> sourceList = schedulingService.list(scheduling);
+            if (CollectionUtils.isNotEmpty(sourceList)) {
+                schedulings = schedulings.stream().filter(s -> {
+                    Optional<LinggangScheduling> opt = sourceList.stream().filter(s1 -> s1.importEqus(s)).findFirst();
+                    return !opt.isPresent();
+                }).filter(s -> Objects.nonNull(s)).collect(Collectors.toList());
+            }
+
+            if(CollectionUtils.isNotEmpty(schedulings)) {
+                schedulingService.saveBatch(schedulings);
+            }
         }
         String dateStr1 = DateUtil.YYYY_MM_DD_LINK.format(date);
         // 异常数据过多，不通过自增获取id再次查询获取
@@ -521,11 +536,14 @@ public class ThreadJobService {
             // 插入错误排班
             errorJobcodeService.insertBatchErrorJobcode(errorScheduling);
         }
-        if(CollectionUtils.isNotEmpty(idSets)) {
+        if (CollectionUtils.isNotEmpty(idSets)) {
             keyWorkLocationService.removeBySchedulingId(idSets);
             schedulingService.removeByIds(idSets);
         }
-        keyWorkLocationService.insertJob(dateStr1,schedulings,null);
+
+        if(CollectionUtils.isNotEmpty(schedulings)) {
+            keyWorkLocationService.insertJob(dateStr1, schedulings, null);
+        }
         log.info("当天排班数据获取完毕,共：{}条", bcList.size());
     }
@@ -292,24 +292,33 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public synchronized boolean insertJob(String timeStr,List<LinggangScheduling> schedulings, Set<Long> schedulingIds) {
+    public synchronized boolean insertJob(String timeStr, List<LinggangScheduling> schedulings, Set<Long> schedulingIds) {
         try {
             removeBySchedulingId(schedulingIds);
             log.info("分配钥匙所存放的柜子:[{}]", timeStr);
             Date date = DateUtil.YYYY_MM_DD_LINK.parse(timeStr);
-            LinggangKeyWorkLocation workLocation = new LinggangKeyWorkLocation();
-            workLocation.setStartScheduleDate(date);
-            workLocation.setEndScheduleDate(DateUtils.addDays(date, 1));
-            Integer count = countId(workLocation);
-            if (Objects.nonNull(count) && count > 0) {
-                log.error("当天的数据已经存在:[{}]；[{}]", timeStr, count);
-                return false;
-            }
-            List<LinggangKeyWorkLocation> locations = computeKeyLocal(date,schedulings);
+//            Integer count = countId(workLocation);
+//            if (Objects.nonNull(count) && count > 0) {
+//                log.error("当天的数据已经存在:[{}]；[{}]", timeStr, count);
+//                return false;
+//            }
+
+            List<LinggangKeyWorkLocation> locations = computeKeyLocal(date, schedulings);
             if (CollectionUtils.isNotEmpty(locations)) {
+                LinggangKeyWorkLocation workLocation = new LinggangKeyWorkLocation();
+                workLocation.setStartScheduleDate(date);
+                workLocation.setEndScheduleDate(DateUtils.addDays(date, 1));
+                List<LinggangKeyWorkLocation> source = list(workLocation);
+                if (CollectionUtils.isNotEmpty(source)) {
+                    locations = locations.stream().filter(l -> {
+                        Optional<LinggangKeyWorkLocation> opt = source.stream().filter(s -> s.importEquals(l)).findFirst();
+                        return !opt.isPresent();
+                    }).collect(Collectors.toList());
+                }
+
                 return saveBatch(locations);
             }
             return true;
@@ -397,7 +406,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             if (CollectionUtils.isNotEmpty(workLocations)) {
                 Set<Long> ids = workLocations.stream().map(LinggangKeyWorkLocation::getId).collect(Collectors.toSet());
                 if (CollectionUtils.isNotEmpty(ids)) {
-                 return    removeByIds(ids);
+                    return removeByIds(ids);
                 }
             }
         }
@@ -722,10 +731,10 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         return source;
     }
-    private List<LinggangKeyWorkLocation> computeKeyLocal(Date date,List<LinggangScheduling> sourceSchedulings) {
+    private List<LinggangKeyWorkLocation> computeKeyLocal(Date date, List<LinggangScheduling> sourceSchedulings) {
-        List<LinggangScheduling> schedulings = querySchedulingByTiime(date,sourceSchedulings);
+        List<LinggangScheduling> schedulings = querySchedulingByTiime(date, sourceSchedulings);
         if (schedulings == null) return null;
         List<LinggangVenueInfo> venueInfos = queryVenueInfo(schedulings);
@@ -817,10 +826,10 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         }).filter(obj -> Objects.nonNull(obj)).collect(Collectors.toList());
     }
-    private List<LinggangScheduling> querySchedulingByTiime(Date date,List<LinggangScheduling> schedulings) {
-        if(CollectionUtils.isNotEmpty(schedulings)){
-            schedulings = schedulings.stream().filter(s->Objects.nonNull(s.getId())).collect(Collectors.toList());
-            if(CollectionUtils.isNotEmpty(schedulings)) {
+    private List<LinggangScheduling> querySchedulingByTiime(Date date, List<LinggangScheduling> schedulings) {
+        if (CollectionUtils.isNotEmpty(schedulings)) {
+            schedulings = schedulings.stream().filter(s -> Objects.nonNull(s.getId())).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(schedulings)) {
                 return schedulings;
             }
         }