修改打卡信息

liujun001
1 parent a838eb45
Showing 2 changed files with 42 additions and 10 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
@@ -189,6 +189,13 @@ public class KeyBoxController extends BaseController {
                 keyInfoIds = workLocations.stream().map(LinggangKeyWorkLocation::getKeyInfoId).collect(Collectors.toSet());
             }
  
+            int hour = dto.getTime().getHours();
+
+
+            if (hour < 3) {
+                dto.setTime(DateUtils.addDays(dto.getTime(), -1));
+            }
+
             List<KeyInfo> keyInfos = queryKeyInfos(keyInfoIds);
  
             LinggangScheduling scheduling = new LinggangScheduling();
@@ -201,6 +208,7 @@ public class KeyBoxController extends BaseController {
             Set<String> jobCodes = null;
             Set<String> nbbms = null;
  
+
             if (CollectionUtils.isNotEmpty(schedulings)) {
                 jobCodes = schedulings.stream().map(LinggangScheduling::getJobCode).collect(Collectors.toSet());
                 nbbms = schedulings.stream().map(LinggangScheduling::getNbbm).collect(Collectors.toSet());
@@ -444,11 +452,11 @@ public class KeyBoxController extends BaseController {
             keyInfo.setPlateNum(dto.getPlate());
             keyInfos = keyInfoService.listLikePlate(keyInfo);
             if (CollectionUtils.isNotEmpty(keyInfos)) {
-                    keyInfoIds = keyInfos.stream().map(KeyInfo::getId).collect(Collectors.toSet());
-                } else {
-                    keyInfoIds = new HashSet<>();
-                    keyInfoIds.add(-10000);
-                }
+                keyInfoIds = keyInfos.stream().map(KeyInfo::getId).collect(Collectors.toSet());
+            } else {
+                keyInfoIds = new HashSet<>();
+                keyInfoIds.add(-10000);
+            }
  
         }
  
@@ -546,7 +546,8 @@ public class ThreadJobService {
             scheduling.setType(b.getType());
  
             return scheduling;
-        }).collect(Collectors.toList());
+        }).filter(s->StringUtils.isBlank(s.getJobCode()) && StringUtils.isBlank(s.getName()) && !StringUtils.equalsAnyIgnoreCase(s.getJobCode(),"null")
+                && !StringUtils.equalsAnyIgnoreCase(s.getName(),"null")).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(schedulings)) {
             Map<String, List<LinggangScheduling>> distinctMap = new HashMap<>();
             schedulings.stream().forEach(s -> {
@@ -586,16 +587,34 @@ public class ThreadJobService {
  
             List<LinggangScheduling> sourceList = schedulingService.list(scheduling);
             if (CollectionUtils.isNotEmpty(sourceList)) {
+
+                List<LinggangScheduling> schedulings1 = schedulings;
+               List<LinggangScheduling> removeSchedulings = sourceList.stream().filter(s->{
+                    Optional<LinggangScheduling> opt = schedulings1.stream().filter(s1 -> s1.importEqus(s)).findFirst();
+                   if (!opt.isPresent()) {
+                       log.debug("需要删除的排班数据:[{}]", s);
+                   }
+                    return !opt.isPresent() && Objects.isNull(s.getSignInId());
+                }).collect(Collectors.toList());
+               if(CollectionUtils.isNotEmpty(removeSchedulings)){
+                   Set<Long> ids = removeSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
+                   schedulingService.removeByIds(ids);
+               }
+
                 schedulings = schedulings.stream().filter(s -> {
                     Optional<LinggangScheduling> opt = sourceList.stream().filter(s1 -> s1.importEqus(s)).findFirst();
-                    if(opt.isPresent()){
-                        log.debug("排班数据已经存在:[{}]",s);
+                    if (opt.isPresent()) {
+                        log.debug("排班数据已经存在:[{}]", s);
                     }
                     return !opt.isPresent();
                 }).filter(s -> Objects.nonNull(s)).collect(Collectors.toList());
             }
  
-            if(CollectionUtils.isNotEmpty(schedulings)) {
+            if (CollectionUtils.isNotEmpty(schedulings)) {
+              List<LinggangScheduling>  schedulings1 = schedulings.stream().filter(s->StringUtils.isBlank(s.getJobCode()) || StringUtils.isBlank(s.getName())).collect(Collectors.toList());
+              if(CollectionUtils.isNotEmpty(schedulings1)){
+                  System.out.println("bbbbbbbbbbb");
+              }
                 schedulingService.saveBatch(schedulings);
             }
         }
@@ -619,7 +638,12 @@ public class ThreadJobService {
             schedulingService.removeByIds(idSets);
         }
  
-        if(CollectionUtils.isNotEmpty(schedulings)) {
+        LinggangScheduling linggangScheduling = new LinggangScheduling();
+        linggangScheduling.setStartScheduleDate(date);
+        linggangScheduling.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(date, 1));
+
+
+        if (CollectionUtils.isNotEmpty(schedulings)) {
             keyWorkLocationService.insertJob(dateStr1, schedulings, null);
         }
         log.info("当天排班数据获取完毕,共：{}条", bcList.size());