钥匙归还

liujun001
1 parent 0a29b019
Showing 3 changed files with 30 additions and 19 deletions
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/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
@@ -9,6 +9,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
  
 import java.util.Date;
  
@@ -153,6 +154,10 @@ public class LinggangScheduling {
     @TableField(exist = false)
     private Date  endScheduleDate;
  
+    public String getCheZhanCode(){
+        return StringUtils.join(qdzcode,"@",zdzcode,"@",jobCode,"@");
+    }
+
  
  
  
@@ -244,8 +244,9 @@ public class DriverJob implements InitializingBean {
     @Transactional(rollbackFor = Exception.class)
     public void getSchedulingInfo() {
         Date date = new Date();
-        JwtAuthenticationTokenFilter.putMDC("job",JwtAuthenticationTokenFilter.getRandomValue());
+
         for (int i = 0; i < 2; i++) {
+            JwtAuthenticationTokenFilter.putMDC("job",JwtAuthenticationTokenFilter.getRandomValue());
             runScheduling(DateUtils.addDays(date, i).getTime());
         }
  
@@ -101,7 +101,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     }
  
     private static void switchTime(LinggangKeyWorkLocation entity, LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper) {
-        if(Objects.isNull(entity) || Objects.isNull(wrapper)){
+        if (Objects.isNull(entity) || Objects.isNull(wrapper)) {
             return;
         }
         if (Objects.nonNull(entity.getStartScheduleDate()) && Objects.nonNull(entity.getEndScheduleDate())) {
@@ -114,7 +114,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     }
  
     private static void switchTypes(LinggangKeyWorkLocation entity, LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper) {
-        if(Objects.isNull(entity) || Objects.isNull(wrapper)){
+        if (Objects.isNull(entity) || Objects.isNull(wrapper)) {
             return;
         }
  
@@ -208,18 +208,18 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             keyInfoIds = null;
         }
  
-        List<Map<String,Date>> dateMaps = new ArrayList<>();
+        List<Map<String, Date>> dateMaps = new ArrayList<>();
         for (Date date : dates) {
             Date endDate = DateUtils.addDays(date, 1);
  
-            Map<String,Date> maps = new HashMap<>();
-            maps.put("startDate",date);
-            maps.put("endDate",endDate);
+            Map<String, Date> maps = new HashMap<>();
+            maps.put("startDate", date);
+            maps.put("endDate", endDate);
             dateMaps.add(maps);
  
         }
  
-        return linggangKeyWorkLocationMapper.listRecentDates(keyInfoIds,dateMaps);
+        return linggangKeyWorkLocationMapper.listRecentDates(keyInfoIds, dateMaps);
     }
  
     // @Override
@@ -292,6 +292,8 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
                 }
             }
  
+            log.info("分配钥匙所存放的柜子:[{}]", timeStr);
+
             Date date = DateUtil.YYYY_MM_DD_LINK.parse(timeStr);
             LinggangKeyWorkLocation workLocation = new LinggangKeyWorkLocation();
             workLocation.setStartScheduleDate(date);
@@ -339,10 +341,10 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         List<LinggangKeyWorkLocation> error = new ArrayList<>();
         source.forEach(s -> {
             boolean flag = false;
-            if(Objects.isNull(s.getId())){
+            if (Objects.isNull(s.getId())) {
                 flag = save(s);
-            }else{
-               flag = update(s);
+            } else {
+                flag = update(s);
             }
  
             if (flag) {
@@ -372,7 +374,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     public boolean update(LinggangKeyWorkLocation location) {
         LambdaUpdateWrapper<LinggangKeyWorkLocation> wrapper = new LambdaUpdateWrapper<>();
         wrapper.set(LinggangKeyWorkLocation::getEventType, location.getEventType()).set(LinggangKeyWorkLocation::getUpdateTime, new Date())
-                .set(LinggangKeyWorkLocation::getType, location.getType()).set(LinggangKeyWorkLocation::getDevice,location.getDevice());
+                .set(LinggangKeyWorkLocation::getType, location.getType()).set(LinggangKeyWorkLocation::getDevice, location.getDevice());
         wrapper.eq(LinggangKeyWorkLocation::getId, location.getId());
  
         return update(wrapper);
@@ -478,7 +480,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
  
         List<LinggangKeyWorkLocation> sources = listRecentDates(dates, keyIds).stream().filter(s -> !Objects.equals(s.getType(), typeEnum.getValue())).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(sources)) {
-            log.info("[{}] 无法找到钥匙归还信息",locations);
+            log.info("[{}] 无法找到钥匙归还信息", locations);
             return ResponseResult.success(locations);
 //            return ResponseResult.error404("无法找到钥匙归还信息");
         }
@@ -504,7 +506,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         Set<Long> schedulingIds = sources.stream().map(LinggangKeyWorkLocation::getSchedulingId).collect(Collectors.toSet());
         List<LinggangScheduling> schedulings = schedulingService.listByIds(schedulingIds);
         if (CollectionUtils.isEmpty(schedulings)) {
-            log.info("[{}] 无法找到钥匙归还信息",locations);
+            log.info("[{}] 无法找到钥匙归还信息", locations);
             return ResponseResult.success(locations);
 //            return ResponseResult.error404("无法找到排班信息");
         }
@@ -520,14 +522,14 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             if (optional.isPresent()) {
                 l.setId(optional.get().getId());
             }
-            Optional<LinggangScheduling> scheOpt = schedulings.stream().filter(s1->Objects.equals(s1.getId(),l.getSchedulingId())).findFirst();
-            if(scheOpt.isPresent()){
-                if(l.getTime().getTime()<scheOpt.get().getZdsjT()){
+            Optional<LinggangScheduling> scheOpt = schedulings.stream().filter(s1 -> Objects.equals(s1.getId(), l.getSchedulingId())).findFirst();
+            if (scheOpt.isPresent()) {
+                if (l.getTime().getTime() < scheOpt.get().getZdsjT()) {
                     return null;
                 }
             }
             return l;
-        }).filter(obj->Objects.nonNull(obj)).collect(Collectors.toList());
+        }).filter(obj -> Objects.nonNull(obj)).collect(Collectors.toList());
  
  
         return ResponseResult.success(locations);
@@ -807,6 +809,9 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             log.info("没有查到排班信息:[{}]", date);
             return null;
         }
+
+        //schedulings =schedulings.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(s -> s.getCheZhanCode()))), ArrayList::new));
+
         return schedulings;
     }
  
@@ -901,7 +906,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     private List<Equipment> queryEquipment(List<LinggangVenueInfo> venueInfos) {
         Set<Integer> venuInfoIds = venueInfos.stream().map(LinggangVenueInfo::getId).collect(Collectors.toSet());
         Equipment equipment = new Equipment();
-        equipment.setStatus(1);
+//        equipment.setStatus(1);
         List<Equipment> equipmentList = equipmentService.listByEntityAndYardIds(equipment, venuInfoIds);
         if (CollectionUtils.isEmpty(equipmentList)) {
             log.info("查询设备数据为空:[{}]", venuInfoIds);